Clean up tests

apache · Feb 23, 2024 · 1eded0c · 1eded0c
1 parent 10213f4
commit 1eded0c
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/tests/api_connexion/endpoints/test_event_log_endpoint.py b/tests/api_connexion/endpoints/test_event_log_endpoint.py
@@ -291,14 +291,9 @@ def test_should_filter_eventlogs_by_when(self, create_log_model, session):
             assert response.status_code == 200
             assert {eventlog["event"] for eventlog in response.json["event_logs"]} == expected_eventlogs
 
-    def test_should_filter_eventlogs_by_included_events(self, create_log_model, session):
-        create_log_model(event="TEST_EVENT_1", when=self.default_time)
-        create_log_model(event="TEST_EVENT_2", when=self.default_time_2)
-        log_model_3 = Log(event="cli_scheduler", owner="root", extra='{"host_name": "e24b454f002a"}')
-        log_model_3.dttm = self.default_time_2
-
-        session.add(log_model_3)
-        session.flush()
+    def test_should_filter_eventlogs_by_included_events(self, create_log_model):
+        for event in ["TEST_EVENT_1", "TEST_EVENT_2", "cli_scheduler"]:
+            create_log_model(event=event, when=self.default_time)
         response = self.client.get(
             "/api/v1/eventLogs?included_events=TEST_EVENT_1,TEST_EVENT_2",
             environ_overrides={"REMOTE_USER": "test_granular"},
@@ -307,21 +302,17 @@ def test_should_filter_eventlogs_by_included_events(self, create_log_model, sess
         response_data = response.json
         assert len(response_data["event_logs"]) == 2
 
-    def test_should_filter_eventlogs_by_excluded_events(self, create_log_model, session):
-        create_log_model(event="TEST_EVENT_1", when=self.default_time)
-        create_log_model(event="TEST_EVENT_2", when=self.default_time_2)
-        log_model_3 = Log(event="cli_scheduler", owner="root", extra='{"host_name": "e24b454f002a"}')
-        log_model_3.dttm = self.default_time_2
-
-        session.add(log_model_3)
-        session.flush()
+    def test_should_filter_eventlogs_by_excluded_events(self, create_log_model):
+        for event in ["TEST_EVENT_1", "TEST_EVENT_2", "cli_scheduler"]:
+            create_log_model(event=event, when=self.default_time)
         response = self.client.get(
             "/api/v1/eventLogs?excluded_events=TEST_EVENT_1,TEST_EVENT_2",
             environ_overrides={"REMOTE_USER": "test_granular"},
         )
         assert response.status_code == 200
         response_data = response.json
         assert len(response_data["event_logs"]) == 1
+        assert {"cli_scheduler"} == {x["event"] for x in response_data["event_logs"]}
 
 
 class TestGetEventLogPagination(TestEventLogEndpoint):