ashb commented on a change in pull request #14776:
URL: https://github.com/apache/airflow/pull/14776#discussion_r595052126
##########
File path: tests/models/test_dag.py
##########
@@ -1305,6 +1305,60 @@ def test_clear_set_dagrun_state(self, dag_run_state):
dagrun = dagruns[0] # type: DagRun
assert dagrun.state == dag_run_state
+ @parameterized.expand(
+ [
+ (State.NONE,),
+ (State.RUNNING,),
+ ]
+ )
+ def test_clear_set_dagrun_state_for_subdag(self, dag_run_state):
+ dag_id = 'test_clear_set_dagrun_state_subdag'
+ self._clean_up(dag_id)
+ task_id = 't1'
+ dag = DAG(dag_id, start_date=DEFAULT_DATE, max_active_runs=1)
+ t_1 = DummyOperator(task_id=task_id, dag=dag)
+ subdag = DAG(dag_id + '.test', start_date=DEFAULT_DATE,
max_active_runs=1)
+ SubDagOperator(task_id='test', subdag=subdag, dag=dag)
+ t_2 = DummyOperator(task_id='task', dag=subdag)
+
+ session = settings.Session()
+ dagrun_1 = dag.create_dagrun(
+ run_type=DagRunType.BACKFILL_JOB,
+ state=State.FAILED,
+ start_date=DEFAULT_DATE,
+ execution_date=DEFAULT_DATE,
+ )
+ session.merge(dagrun_1)
+
+ task_instance_1 = TI(t_1, execution_date=DEFAULT_DATE,
state=State.RUNNING)
+ task_instance_2 = TI(t_2, execution_date=DEFAULT_DATE,
state=State.RUNNING)
+ session.merge(task_instance_1)
+ session.merge(task_instance_2)
+ session.commit()
+
+ dag.clear(
+ start_date=DEFAULT_DATE,
+ end_date=DEFAULT_DATE + datetime.timedelta(days=1),
+ dag_run_state=dag_run_state,
+ include_subdags=True,
+ include_parentdag=False,
+ session=session,
+ )
+
+ dagruns = (
+ session.query(
+ DagRun,
+ )
+ .filter(
+ DagRun.dag_id.in_([dag_id, dag_id + '.test']),
+ )
+ .all()
+ )
+
+ assert len(dagruns) == 1
+ dagrun = dagruns[0] # type: DagRun
Review comment:
```suggestion
dagrun = (
session.query(
DagRun,
)
.filter(
DagRun.dag_id.in_([dag_id, dag_id + '.test']),
)
.one()
)
```
----------------------------------------------------------------
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]
