From 301444728b1a51f4d840e9e3c2aa2e9d02deadd6 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Date: Thu, 11 Sep 2025 13:28:51 +0100 Subject: [PATCH 1/3] Fix trigger log tests --- airflow-core/tests/unit/jobs/test_triggerer_job.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/airflow-core/tests/unit/jobs/test_triggerer_job.py b/airflow-core/tests/unit/jobs/test_triggerer_job.py index 2ec8733992e27..8d939a3c9152f 100644 --- a/airflow-core/tests/unit/jobs/test_triggerer_job.py +++ b/airflow-core/tests/unit/jobs/test_triggerer_job.py @@ -277,18 +277,21 @@ def test_trigger_log(mock_monotonic, trigger, watcher_count, trigger_count, sess """ Checks that the triggerer will log watcher and trigger in separate lines. """ - create_trigger_in_db(session, trigger) + _, _, trigger_orm, _ = create_trigger_in_db(session, trigger) - trigger_runner_supervisor = TriggerRunnerSupervisor.start(job=Job(id=12345), capacity=10) + trigger_runner_supervisor = TriggerRunnerSupervisor.start(job=Job(id=123456), capacity=10) trigger_runner_supervisor.load_triggers() - for _ in range(10): + for _ in range(30): trigger_runner_supervisor._service_subprocess(0.1) stdout = capsys.readouterr().out assert f"{trigger_count} triggers currently running" in stdout assert f"{watcher_count} watchers currently running" in stdout + session.delete(trigger_orm) + session.commit() + trigger_runner_supervisor.kill(force=False) From 25cd196c13ef9f35b6aaf68919f9b451fcc73d22 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Date: Fri, 12 Sep 2025 12:01:43 +0100 Subject: [PATCH 2/3] Fix trigger job log test --- airflow-core/tests/unit/jobs/test_triggerer_job.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airflow-core/tests/unit/jobs/test_triggerer_job.py b/airflow-core/tests/unit/jobs/test_triggerer_job.py index 8d939a3c9152f..67925c44e98fb 100644 --- a/airflow-core/tests/unit/jobs/test_triggerer_job.py +++ b/airflow-core/tests/unit/jobs/test_triggerer_job.py @@ -270,7 +270,10 @@ def send_msg_spy(self, msg, *args, **kwargs): @pytest.mark.parametrize( "trigger, watcher_count, trigger_count", - [(TimeDeltaTrigger(datetime.timedelta(days=7)), 0, 1), (FileDeleteTrigger("/tmp/foo.txt"), 1, 0)], + [ + (TimeDeltaTrigger(datetime.timedelta(days=7)), 0, 1), + (FileDeleteTrigger("/tmp/foo.txt", poke_interval=1), 1, 0), + ], ) @patch("time.monotonic", side_effect=itertools.count(start=1, step=60)) def test_trigger_log(mock_monotonic, trigger, watcher_count, trigger_count, session, capsys): From f8aa13d2eabafa7c50ee1dcda62ec77f6d842b48 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Date: Fri, 12 Sep 2025 14:32:04 +0100 Subject: [PATCH 3/3] Resolve comments --- airflow-core/tests/unit/jobs/test_triggerer_job.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/airflow-core/tests/unit/jobs/test_triggerer_job.py b/airflow-core/tests/unit/jobs/test_triggerer_job.py index 67925c44e98fb..bd390c82cbb60 100644 --- a/airflow-core/tests/unit/jobs/test_triggerer_job.py +++ b/airflow-core/tests/unit/jobs/test_triggerer_job.py @@ -66,7 +66,9 @@ clear_db_connections, clear_db_dag_bundles, clear_db_dags, + clear_db_jobs, clear_db_runs, + clear_db_triggers, clear_db_variables, clear_db_xcom, ) @@ -86,6 +88,8 @@ def clean_database(): clear_db_dag_bundles() clear_db_xcom() clear_db_variables() + clear_db_triggers() + clear_db_jobs() yield # Test runs here clear_db_connections() clear_db_runs() @@ -93,6 +97,8 @@ def clean_database(): clear_db_dag_bundles() clear_db_xcom() clear_db_variables() + clear_db_triggers() + clear_db_jobs() def create_trigger_in_db(session, trigger, operator=None): @@ -280,7 +286,7 @@ def test_trigger_log(mock_monotonic, trigger, watcher_count, trigger_count, sess """ Checks that the triggerer will log watcher and trigger in separate lines. """ - _, _, trigger_orm, _ = create_trigger_in_db(session, trigger) + create_trigger_in_db(session, trigger) trigger_runner_supervisor = TriggerRunnerSupervisor.start(job=Job(id=123456), capacity=10) trigger_runner_supervisor.load_triggers() @@ -292,9 +298,6 @@ def test_trigger_log(mock_monotonic, trigger, watcher_count, trigger_count, sess assert f"{trigger_count} triggers currently running" in stdout assert f"{watcher_count} watchers currently running" in stdout - session.delete(trigger_orm) - session.commit() - trigger_runner_supervisor.kill(force=False)