From b6142c2103325a17f9e225bc73c161b6fac602f8 Mon Sep 17 00:00:00 2001 From: Jed Cunningham Date: Mon, 3 Feb 2025 14:23:42 -0700 Subject: [PATCH] Fix a bad rebase / couple more asserts :) --- tests/dag_processing/test_manager.py | 39 ++++------------------------ 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/tests/dag_processing/test_manager.py b/tests/dag_processing/test_manager.py index 0496101db187f..ebc3536c83f23 100644 --- a/tests/dag_processing/test_manager.py +++ b/tests/dag_processing/test_manager.py @@ -899,34 +899,6 @@ def test_bundles_versions_are_stored(self, session): model = session.get(DagBundleModel, "bundleone") assert model.version == "123" - def test_non_versioned_bundle_get_version_not_called(self): - config = [ - { - "name": "bundleone", - "classpath": "airflow.dag_processing.bundles.local.LocalDagBundle", - "kwargs": {"path": "/dev/null", "refresh_interval": 0}, - }, - ] - - mybundle = MagicMock() - mybundle.name = "bundleone" - mybundle.refresh_interval = 0 - mybundle.supports_versioning = False - - with conf_vars({("dag_processor", "dag_bundle_config_list"): json.dumps(config)}): - DagBundlesManager().sync_bundles_to_db() - with mock.patch( - "airflow.dag_processing.bundles.manager.DagBundlesManager" - ) as mock_bundle_manager: - mock_bundle_manager.return_value._bundle_config = {"bundleone": None} - mock_bundle_manager.return_value.get_all_dag_bundles.return_value = [mybundle] - manager = DagFileProcessorManager(max_runs=1) - manager.run() - - with create_session() as session: - model = session.get(DagBundleModel, "bundleone") - assert model.version == "123" - def test_non_versioned_bundle_get_version_not_called(self): config = [ { @@ -944,14 +916,13 @@ def test_non_versioned_bundle_get_version_not_called(self): with conf_vars({("dag_processor", "dag_bundle_config_list"): json.dumps(config)}): DagBundlesManager().sync_bundles_to_db() - with mock.patch( - "airflow.dag_processing.bundles.manager.DagBundlesManager" - ) as mock_bundle_manager: + with mock.patch("airflow.dag_processing.manager.DagBundlesManager") as mock_bundle_manager: mock_bundle_manager.return_value._bundle_config = {"bundleone": None} mock_bundle_manager.return_value.get_all_dag_bundles.return_value = [bundleone] manager = DagFileProcessorManager(max_runs=1) manager.run() + bundleone.refresh.assert_called_once() bundleone.get_current_version.assert_not_called() def test_versioned_bundle_get_version_called_once(self): @@ -974,15 +945,15 @@ def test_versioned_bundle_get_version_called_once(self): with conf_vars({("dag_processor", "dag_bundle_config_list"): json.dumps(config)}): DagBundlesManager().sync_bundles_to_db() - with mock.patch( - "airflow.dag_processing.bundles.manager.DagBundlesManager" - ) as mock_bundle_manager: + with mock.patch("airflow.dag_processing.manager.DagBundlesManager") as mock_bundle_manager: mock_bundle_manager.return_value._bundle_config = {"bundleone": None} mock_bundle_manager.return_value.get_all_dag_bundles.return_value = [bundleone] manager = DagFileProcessorManager(max_runs=1) manager.run() # run it once to warm up # now run it again so we can check we only call get_current_version once + bundleone.refresh.reset_mock() bundleone.get_current_version.reset_mock() manager.run() + bundleone.refresh.assert_called_once() bundleone.get_current_version.assert_called_once()