jedcunningham commented on code in PR #37641:
URL: https://github.com/apache/airflow/pull/37641#discussion_r1500047969
##########
tests/api_connexion/endpoints/test_event_log_endpoint.py:
##########
@@ -291,6 +291,38 @@ 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()
Review Comment:
```suggestion
for event in ["TEST_EVENT_1", "TEST_EVENT_2", "cli_scheduler"]:
create_log_model(event=event, when=self.default_time)
```
Would this work instead?
##########
tests/api_connexion/endpoints/test_event_log_endpoint.py:
##########
@@ -291,6 +291,38 @@ 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):
Review Comment:
```suggestion
def test_should_filter_eventlogs_by_included_events(self,
create_log_model):
```
If so, we can also get rid of the session fixture.
##########
tests/api_connexion/endpoints/test_event_log_endpoint.py:
##########
@@ -291,6 +291,38 @@ 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()
+ response = self.client.get(
+ "/api/v1/eventLogs?included_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"]) == 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()
Review Comment:
```suggestion
for event in ["TEST_EVENT_1", "TEST_EVENT_2", "cli_scheduler"]:
create_log_model(event=event, when=self.default_time)
```
##########
tests/api_connexion/endpoints/test_event_log_endpoint.py:
##########
@@ -291,6 +291,38 @@ 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()
+ response = self.client.get(
+ "/api/v1/eventLogs?included_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"]) == 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()
+ 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
Review Comment:
```suggestion
assert len(response_data["event_logs"]) == 1
assert {"cli_scheduler"} == {x.event for x in
response_data["event_logs"]}
```
(Untested)
##########
tests/api_connexion/endpoints/test_event_log_endpoint.py:
##########
@@ -291,6 +291,38 @@ 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()
+ response = self.client.get(
+ "/api/v1/eventLogs?included_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"]) == 2
+
+ def test_should_filter_eventlogs_by_excluded_events(self,
create_log_model, session):
Review Comment:
```suggestion
def test_should_filter_eventlogs_by_excluded_events(self,
create_log_model):
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
