Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test metrics #140

Merged
merged 21 commits into from
Mar 18, 2021
Merged

Test metrics #140

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
23da089
First endpoints tests (Routers: App and Config)
JFer11 Dec 20, 2020
919363c
First endpoints tests (Routers: App and Config) II
JFer11 Dec 21, 2020
6681c8d
Changes based on comments
JFer11 Dec 23, 2020
dd4155a
First Tests, Refactored
JFer11 Jan 14, 2021
a67a7b5
First endpoints tests (Routers: App and Config) III
JFer11 Jan 21, 2021
da1c868
Merge branch 'tests_api_processor_routers'
JFer11 Jan 25, 2021
bcd8bfd
Merge branch 'master' of github.com:neuralet/smart-social-distancing
JFer11 Jan 29, 2021
a355d86
Merge branch 'master' of github.com:xmartlabs/smart-social-distancing
JFer11 Feb 15, 2021
b4b36f2
First commit metrics tests
JFer11 Mar 1, 2021
4540095
Parameterization
JFer11 Mar 1, 2021
377ddc9
Parametrization II
JFer11 Mar 1, 2021
bec5d4d
First commit areas
JFer11 Mar 2, 2021
66e6716
Progress I
JFer11 Mar 4, 2021
3f3a9d7
Restructure of fixtures, progress in area endpoints, bug fixing, etc
JFer11 Mar 7, 2021
b77a974
Remove extra pytest fixtures
JFer11 Mar 7, 2021
b0b796a
git comments changes
JFer11 Mar 7, 2021
541606e
Last commit of progress
JFer11 Mar 10, 2021
d405547
maybe an error
JFer11 Mar 10, 2021
d0f2088
Conflicts and merge
JFer11 Mar 16, 2021
2b59ab9
Updating tests
JFer11 Mar 17, 2021
8aaa0c2
Id config file changed
JFer11 Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Conflicts and merge
  • Loading branch information
@JFer11
JFer11 committed Mar 16, 2021
commit d0f208899a7652e5dcfde5ce6d3c80c5b6a3d9d5
2 changes: 1 addition & 1 deletion api/routers/metrics/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get_cameras_for_areas(areas: Iterator[str]) -> Iterator[str]:
cameras = []
for area_config in config.values():
if area_config["Id"] in areas:
cameras.extend(area_config["Cameras"].split(","))
cameras.extend(area_config[CAMERAS.capitalize()].split(","))
return cameras


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.