Skip to content

Commit 8ea4eb1

Browse files
bugraoz93potiuk
authored andcommitted
Fix tests/decorators/test_python.py for database isolation tests (#41387)
* Pass serialized parameter for dag_maker * Serialisation of object is on __exit__ moving out the dag definition out of dag_maker context (cherry picked from commit 278f3c4)
1 parent 6c6797c commit 8ea4eb1

File tree

1 file changed

+41
-39
lines changed

1 file changed

+41
-39
lines changed

tests/decorators/test_python.py

+41-39
Original file line numberDiff line numberDiff line change
@@ -1000,50 +1000,52 @@ def down(a: str):
10001000

10011001

10021002
def test_teardown_trigger_rule_selective_application(dag_maker, session):
1003-
with dag_maker(session=session) as dag:
1004-
1005-
@dag.task
1006-
def my_work():
1007-
return "abc"
1008-
1009-
@setup
1010-
@dag.task
1011-
def my_setup():
1012-
return "abc"
1013-
1014-
@teardown
1015-
@dag.task
1016-
def my_teardown():
1017-
return "abc"
1018-
1019-
work_task = my_work()
1020-
setup_task = my_setup()
1021-
teardown_task = my_teardown()
1003+
with dag_maker(session=session, serialized=True) as created_dag:
1004+
dag = created_dag
1005+
1006+
@dag.task
1007+
def my_work():
1008+
return "abc"
1009+
1010+
@setup
1011+
@dag.task
1012+
def my_setup():
1013+
return "abc"
1014+
1015+
@teardown
1016+
@dag.task
1017+
def my_teardown():
1018+
return "abc"
1019+
1020+
work_task = my_work()
1021+
setup_task = my_setup()
1022+
teardown_task = my_teardown()
10221023
assert work_task.operator.trigger_rule == TriggerRule.ALL_SUCCESS
10231024
assert setup_task.operator.trigger_rule == TriggerRule.ALL_SUCCESS
10241025
assert teardown_task.operator.trigger_rule == TriggerRule.ALL_DONE_SETUP_SUCCESS
10251026

10261027

10271028
def test_teardown_trigger_rule_override_behavior(dag_maker, session):
1028-
with dag_maker(session=session) as dag:
1029-
1030-
@dag.task(trigger_rule=TriggerRule.ONE_SUCCESS)
1031-
def my_work():
1032-
return "abc"
1033-
1034-
@setup
1035-
@dag.task(trigger_rule=TriggerRule.ONE_SUCCESS)
1036-
def my_setup():
1037-
return "abc"
1038-
1039-
@teardown
1040-
@dag.task(trigger_rule=TriggerRule.ONE_SUCCESS)
1041-
def my_teardown():
1042-
return "abc"
1043-
1044-
work_task = my_work()
1045-
setup_task = my_setup()
1046-
with pytest.raises(Exception, match="Trigger rule not configurable for teardown tasks."):
1047-
my_teardown()
1029+
with dag_maker(session=session, serialized=True) as created_dag:
1030+
dag = created_dag
1031+
1032+
@dag.task(trigger_rule=TriggerRule.ONE_SUCCESS)
1033+
def my_work():
1034+
return "abc"
1035+
1036+
@setup
1037+
@dag.task(trigger_rule=TriggerRule.ONE_SUCCESS)
1038+
def my_setup():
1039+
return "abc"
1040+
1041+
@teardown
1042+
@dag.task(trigger_rule=TriggerRule.ONE_SUCCESS)
1043+
def my_teardown():
1044+
return "abc"
1045+
1046+
work_task = my_work()
1047+
setup_task = my_setup()
1048+
with pytest.raises(Exception, match="Trigger rule not configurable for teardown tasks."):
1049+
my_teardown()
10481050
assert work_task.operator.trigger_rule == TriggerRule.ONE_SUCCESS
10491051
assert setup_task.operator.trigger_rule == TriggerRule.ONE_SUCCESS

0 commit comments

Comments
 (0)