mik-laj commented on a change in pull request #9153:
URL: https://github.com/apache/airflow/pull/9153#discussion_r436576266
##########
File path: tests/api_connexion/endpoints/test_dag_run_endpoint.py
##########
@@ -29,26 +35,471 @@ def setUpClass(cls) -> None:
def setUp(self) -> None:
self.client = self.app.test_client() # type:ignore
+ self.now = timezone.utcnow()
+ clear_db_runs()
+
+ def tearDown(self) -> None:
+ clear_db_runs()
class TestDeleteDagRun(TestDagRunEndpoint):
@pytest.mark.skip(reason="Not implemented yet")
def test_should_response_200(self):
- response =
self.client.delete("/dags/TEST_DAG_ID}/dagRuns/TEST_DAG_RUN_ID")
+ response =
self.client.delete("api/v1/dags/TEST_DAG_ID}/dagRuns/TEST_DAG_RUN_ID")
assert response.status_code == 204
class TestGetDagRun(TestDagRunEndpoint):
- @pytest.mark.skip(reason="Not implemented yet")
- def test_should_response_200(self):
- response = self.client.get("/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID")
+
+ @provide_session
+ def test_should_response_200(self, session):
+ dagrun_model = DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID',
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now,
+ start_date=self.now,
+ external_trigger=True,
+ )
+ session.add(dagrun_model)
+ session.commit()
+ result = session.query(DagRun).all()
+ assert len(result) == 1
+ response =
self.client.get("api/v1/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID")
assert response.status_code == 200
+ self.assertEqual(
+ response.json,
+ {
+ 'dag_id': 'TEST_DAG_ID',
+ 'dag_run_id': 'TEST_DAG_RUN_ID',
+ 'end_date': None,
+ 'state': 'running',
+ 'execution_date': self.now.isoformat(),
+ 'external_trigger': True,
+ 'start_date': self.now.isoformat(),
+ 'conf': {},
+ }
+ )
+
+ def test_should_response_404(self):
+ response = self.client.get("api/v1/dags/invalid-id/dagRuns/invalid-id")
+ assert response.status_code == 404
+ self.assertEqual(
+ {
+ 'detail': None,
+ 'status': 404,
+ 'title': 'DAGRun not found',
+ 'type': 'about:blank'
+ },
+ response.json
+ )
class TestGetDagRuns(TestDagRunEndpoint):
- @pytest.mark.skip(reason="Not implemented yet")
+
+ @provide_session
+ def test_should_response_200(self, session):
+ dagrun_model_1 = DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID_1',
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now,
+ start_date=self.now,
+ external_trigger=True,
+ )
+ dagrun_model_2 = DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID_2',
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now + timedelta(minutes=1),
+ start_date=self.now,
+ external_trigger=True,
+ )
+ session.add_all([dagrun_model_1, dagrun_model_2])
+ session.commit()
+ result = session.query(DagRun).all()
+ assert len(result) == 2
+ response = self.client.get("api/v1/dags/TEST_DAG_ID/dagRuns")
+ assert response.status_code == 200
+ self.assertEqual(
+ response.json,
+ {
+ "dag_runs": [
+ {
+ 'dag_id': 'TEST_DAG_ID',
+ 'dag_run_id': 'TEST_DAG_RUN_ID_1',
+ 'end_date': None,
+ 'state': 'running',
+ 'execution_date': self.now.isoformat(),
+ 'external_trigger': True,
+ 'start_date': self.now.isoformat(),
+ 'conf': {},
+ },
+ {
+ 'dag_id': 'TEST_DAG_ID',
+ 'dag_run_id': 'TEST_DAG_RUN_ID_2',
+ 'end_date': None,
+ 'state': 'running',
+ 'execution_date': (self.now +
timedelta(minutes=1)).isoformat(),
+ 'external_trigger': True,
+ 'start_date': self.now.isoformat(),
+ 'conf': {},
+ }
+ ],
+ "total_entries": 2
+ }
+ )
+
+ @provide_session
+ def test_should_return_all_with_tilde_as_dag_id(self, session):
+ dagrun_model_1 = DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID_1',
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now,
+ start_date=self.now,
+ external_trigger=True,
+ )
+ dagrun_model_2 = DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID_2',
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now + timedelta(minutes=1),
+ start_date=self.now,
+ external_trigger=True,
+ )
+ session.add_all([dagrun_model_1, dagrun_model_2])
+ session.commit()
+ result = session.query(DagRun).all()
+ assert len(result) == 2
+ response = self.client.get("api/v1/dags/~/dagRuns")
+ assert response.status_code == 200
+ self.assertEqual(
+ response.json,
+ {
+ "dag_runs": [
+ {
+ 'dag_id': 'TEST_DAG_ID',
+ 'dag_run_id': 'TEST_DAG_RUN_ID_1',
+ 'end_date': None,
+ 'state': 'running',
+ 'execution_date': self.now.isoformat(),
+ 'external_trigger': True,
+ 'start_date': self.now.isoformat(),
+ 'conf': {},
+ },
+ {
+ 'dag_id': 'TEST_DAG_ID',
+ 'dag_run_id': 'TEST_DAG_RUN_ID_2',
+ 'end_date': None,
+ 'state': 'running',
+ 'execution_date': (self.now +
timedelta(minutes=1)).isoformat(),
+ 'external_trigger': True,
+ 'start_date': self.now.isoformat(),
+ 'conf': {},
+ }
+ ],
+ "total_entries": 2
+ }
+ )
+
+ @provide_session
+ def test_handle_limit_in_query(self, session):
+ dagrun_models = [DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID' + str(i),
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now + timedelta(minutes=i),
+ start_date=self.now,
+ external_trigger=True,
+ ) for i in range(100)]
+
+ session.add_all(dagrun_models)
+ session.commit()
+ result = session.query(DagRun).all()
+ assert len(result) == 100
+
+ response = self.client.get(
+ "api/v1/dags/TEST_DAG_ID/dagRuns?limit=1"
+ )
+ assert response.status_code == 200
+ self.assertEqual(response.json.get('total_entries'), 1)
+ self.assertEqual(
+ response.json,
+ {
+ "dag_runs": [
+ {
+ 'dag_id': 'TEST_DAG_ID',
+ 'dag_run_id': 'TEST_DAG_RUN_ID0',
+ 'end_date': None,
+ 'state': 'running',
+ 'execution_date': (self.now +
timedelta(minutes=0)).isoformat(),
+ 'external_trigger': True,
+ 'start_date': self.now.isoformat(),
+ 'conf': {},
+ }
+ ],
+ "total_entries": 1
+ }
+ )
+
+ @provide_session
+ def test_handle_offset_in_query(self, session):
+ dagrun_models = [DagRun(
+ dag_id='TEST_DAG_ID',
+ run_id='TEST_DAG_RUN_ID' + str(i),
+ run_type=DagRunType.MANUAL.value,
+ execution_date=self.now + timedelta(minutes=i),
+ start_date=self.now,
+ external_trigger=True,
+ ) for i in range(4)]
+
+ session.add_all(dagrun_models)
+ session.commit()
+ result = session.query(DagRun).all()
+ assert len(result) == 4
+
+ response = self.client.get(
+ "api/v1/dags/TEST_DAG_ID/dagRuns?offset=1"
+ )
+ assert response.status_code == 200
+ self.assertEqual(response.json.get('total_entries'), 3)
Review comment:
```suggestion
self.assertEqual(response.json.get('total_entries'), 4)
```
This should always return the amount of all items.
<img width="497" alt="Screenshot 2020-06-08 at 11 44 19"
src="https://user-images.githubusercontent.com/12058428/84016326-69d82300-a97d-11ea-952c-37c472d3e16f.png";>
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
![https://user-images.githubusercontent.com/12058428/84016326-69d82300-a97d-11ea-952c-37c472d3e16f.png"](https://user-images.githubusercontent.com/12058428/84016326-69d82300-a97d-11ea-952c-37c472d3e16f.png"){kind=link}