Skip to content

Fix main Branch Test Failures #42744

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

Merged
vincbeck merged 1 commit into from
Oct 4, 2024
Merged

Fix main Branch Test Failures #42744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions ...er/api_endpoints/test_dataset_endpoint.py → ...ager/api_endpoints/test_asset_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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"},
)

Expand All @@ -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"},
)

Expand All @@ -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
Expand All @@ -160,23 +160,23 @@ 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"},
)

assert response.status_code == 204
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):
dag_id = "not_exists"
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"},
)

Expand All @@ -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()
Expand All @@ -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"},
)

Expand All @@ -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"},
)

Expand All @@ -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"},
)

Expand All @@ -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"},
)

Expand All @@ -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"},
)

Expand All @@ -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"},
)

Expand Down