From e0f7542411cb5b73722d656cceb7569312472ae8 Mon Sep 17 00:00:00 2001 From: Pablo Grill Date: Wed, 11 Aug 2021 11:54:27 -0300 Subject: [PATCH] Fixing tests. Rebasing with master. --- api/models/config.py | 8 ++++++++ api/tests/app/test_camera.py | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/models/config.py b/api/models/config.py index b1e22f99..db98886e 100644 --- a/api/models/config.py +++ b/api/models/config.py @@ -29,10 +29,18 @@ class ConfigDTO(SnakeModel): periodicTasks: Optional[List[PeriodicTaskDTO]] = [] +class ConfigMetrics(BaseModel): + social_distancing: bool + facemask: bool + occupancy: bool + in_out: bool + + class ConfigInfo(BaseModel): version: str device: str has_been_configured: bool + metrics: ConfigMetrics class Config: schema_extra = { diff --git a/api/tests/app/test_camera.py b/api/tests/app/test_camera.py index e5d95768..ef889682 100644 --- a/api/tests/app/test_camera.py +++ b/api/tests/app/test_camera.py @@ -171,8 +171,6 @@ def test_edit_a_camera_properly(self, config_rollback, camera_sample, rollback_c camera_id = camera_sample["id"] body = { - "violation_threshold": 22, - "notify_every_minutes": 22, "id": camera_id, "name": "new_Kitchen", "video_path": "/repo/api/tests/data/mocked_data/data/softbio_vid.mp4",