cleaning up tests after rebase

apache · Jun 10, 2021 · a331f55 · a331f55
1 parent ee77628
commit a331f55
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/airflow/api_connexion/endpoints/dag_endpoint.py b/airflow/api_connexion/endpoints/dag_endpoint.py
@@ -65,7 +65,7 @@ def get_dags(limit, session, offset=0, only_active=True):
     if only_active:
         dags_query = session.query(DagModel).filter(~DagModel.is_subdag, DagModel.is_active)
     else:
-        dags_query = session.query(DagModel).filter(~DagModel.is_subdag) 
+        dags_query = session.query(DagModel).filter(~DagModel.is_subdag)
 
     readable_dags = current_app.appbuilder.sm.get_accessible_dag_ids(g.user)
 

diff --git a/airflow/api_connexion/openapi/v1.yaml b/airflow/api_connexion/openapi/v1.yaml
@@ -931,13 +931,6 @@ paths:
       parameters:
         - $ref: '#/components/parameters/PageLimit'
         - $ref: '#/components/parameters/PageOffset'
-        - name: only_active
-          in: query
-          schema:
-            type: boolean
-            default: true
-          required: false
-          description: Only return active DAGs.
       responses:
         '200':
           description: Success.

diff --git a/airflow/models/dag.py b/airflow/models/dag.py
@@ -2106,7 +2106,7 @@ class DagModel(Base):
     is_paused = Column(Boolean, default=is_paused_at_creation)
     # Whether the DAG is a subdag
     is_subdag = Column(Boolean, default=False)
-    # Whether that DAG is currently seen by the scheduler(s)
+    # Whether that DAG was seen on the last DagBag load
     is_active = Column(Boolean, default=False)
     # Last time the scheduler started
     last_parsed_time = Column(UtcDateTime)

diff --git a/tests/api_connexion/endpoints/test_dag_endpoint.py b/tests/api_connexion/endpoints/test_dag_endpoint.py
@@ -454,13 +454,9 @@ def test_should_respond_200(self, session):
             "total_entries": 2,
         } == response.json
 
-    @provide_session
-    def test_only_active_true_returns_active_dags(self, session):
+    def test_only_active_true_returns_active_dags(self):
         self._create_dag_models(1)
-        dag_model = DagModel(
-            dag_id="TEST_DAG_2", fileloc="/tmp/dag_2.py", schedule_interval="2 2 * * *", is_active=False
-        )
-        session.add(dag_model)
+        self._create_deactivated_dag()
         response = self.client.get("api/v1/dags?only_active=True", environ_overrides={'REMOTE_USER': "test"})
         file_token = SERIALIZER.dumps("/tmp/dag_1.py")
         assert response.status_code == 200
@@ -486,16 +482,12 @@ def test_only_active_true_returns_active_dags(self, session):
             "total_entries": 1,
         } == response.json
 
-    @provide_session
-    def test_only_active_false_returns_all_dags(self, session):
+    def test_only_active_false_returns_all_dags(self):
         self._create_dag_models(1)
-        dag_model = DagModel(
-            dag_id="TEST_DAG_2", fileloc="/tmp/dag_2.py", schedule_interval="2 2 * * *", is_active=False
-        )
-        session.add(dag_model)
+        self._create_deactivated_dag()
         response = self.client.get("api/v1/dags?only_active=False", environ_overrides={'REMOTE_USER': "test"})
         file_token = SERIALIZER.dumps("/tmp/dag_1.py")
-        file_token_2 = SERIALIZER.dumps("/tmp/dag_2.py")
+        file_token_2 = SERIALIZER.dumps("/tmp/dag_del_1.py")
         assert response.status_code == 200
         assert {
             "dags": [
@@ -516,9 +508,9 @@ def test_only_active_false_returns_all_dags(self, session):
                     "tags": [],
                 },
                 {
-                    "dag_id": "TEST_DAG_2",
+                    "dag_id": "TEST_DAG_DELETED_1",
                     "description": None,
-                    "fileloc": "/tmp/dag_2.py",
+                    "fileloc": "/tmp/dag_del_1.py",
                     "file_token": file_token_2,
                     "is_paused": False,
                     "is_active": False,