diff --git a/tests/providers/fab/auth_manager/api_endpoints/test_dataset_endpoint.py b/tests/providers/fab/auth_manager/api_endpoints/test_asset_endpoint.py similarity index 90% rename from tests/providers/fab/auth_manager/api_endpoints/test_dataset_endpoint.py rename to tests/providers/fab/auth_manager/api_endpoints/test_asset_endpoint.py index 4d302722223d8..8e749d1dd18f2 100644 --- a/tests/providers/fab/auth_manager/api_endpoints/test_dataset_endpoint.py +++ b/tests/providers/fab/auth_manager/api_endpoints/test_asset_endpoint.py @@ -107,7 +107,7 @@ def _create_asset_dag_run_queues(self, dag_id, dataset_id, session): return ddrq -class TestGetDagDatasetQueuedEvent(TestQueuedEventEndpoint): +class TestGetDagAssetQueuedEvent(TestQueuedEventEndpoint): @pytest.mark.usefixtures("time_freezer") def test_should_respond_200(self, session, create_dummy_dag): dag, _ = create_dummy_dag() @@ -117,7 +117,7 @@ def test_should_respond_200(self, session, create_dummy_dag): dataset_uri = "s3://bucket/key" response = self.client.get( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -133,7 +133,7 @@ def test_should_respond_404(self): dataset_uri = "not_exists" response = self.client.get( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -146,7 +146,7 @@ def test_should_respond_404(self): } == response.json -class TestDeleteDagDatasetQueuedEvent(TestAssetEndpoint): +class TestDeleteDagAssetQueuedEvent(TestAssetEndpoint): def test_delete_should_respond_204(self, session, create_dummy_dag): dag, _ = create_dummy_dag() dag_id = dag.dag_id @@ -160,7 +160,7 @@ def test_delete_should_respond_204(self, session, create_dummy_dag): assert len(conn) == 1 response = self.client.delete( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -168,7 +168,7 @@ def test_delete_should_respond_204(self, session, create_dummy_dag): conn = session.query(AssetDagRunQueue).all() assert len(conn) == 0 _check_last_log( - session, dag_id=dag_id, event="api.delete_dag_dataset_queued_event", execution_date=None + session, dag_id=dag_id, event="api.delete_dag_asset_queued_event", execution_date=None ) def test_should_respond_404(self): @@ -176,7 +176,7 @@ def test_should_respond_404(self): dataset_uri = "not_exists" response = self.client.delete( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/dags/{dag_id}/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -189,7 +189,7 @@ def test_should_respond_404(self): } == response.json -class TestGetDagDatasetQueuedEvents(TestQueuedEventEndpoint): +class TestGetDagAssetQueuedEvents(TestQueuedEventEndpoint): @pytest.mark.usefixtures("time_freezer") def test_should_respond_200(self, session, create_dummy_dag): dag, _ = create_dummy_dag() @@ -198,7 +198,7 @@ def test_should_respond_200(self, session, create_dummy_dag): self._create_asset_dag_run_queues(dag_id, dataset_id, session) response = self.client.get( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent", + f"/api/v1/dags/{dag_id}/assets/queuedEvent", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -218,7 +218,7 @@ def test_should_respond_404(self): dag_id = "not_exists" response = self.client.get( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent", + f"/api/v1/dags/{dag_id}/assets/queuedEvent", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -236,7 +236,7 @@ def test_should_respond_404(self): dag_id = "not_exists" response = self.client.delete( - f"/api/v1/dags/{dag_id}/datasets/queuedEvent", + f"/api/v1/dags/{dag_id}/assets/queuedEvent", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -259,7 +259,7 @@ def test_should_respond_200(self, session, create_dummy_dag): dataset_uri = "s3://bucket/key" response = self.client.get( - f"/api/v1/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -279,7 +279,7 @@ def test_should_respond_404(self): dataset_uri = "not_exists" response = self.client.get( - f"/api/v1/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) @@ -301,20 +301,20 @@ def test_delete_should_respond_204(self, session, create_dummy_dag): dataset_uri = "s3://bucket/key" response = self.client.delete( - f"/api/v1/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, ) assert response.status_code == 204 conn = session.query(AssetDagRunQueue).all() assert len(conn) == 0 - _check_last_log(session, dag_id=None, event="api.delete_dataset_queued_events", execution_date=None) + _check_last_log(session, dag_id=None, event="api.delete_asset_queued_events", execution_date=None) def test_should_respond_404(self): dataset_uri = "not_exists" response = self.client.delete( - f"/api/v1/datasets/queuedEvent/{dataset_uri}", + f"/api/v1/assets/queuedEvent/{dataset_uri}", environ_overrides={"REMOTE_USER": "test_queued_event"}, )