From e2a1264e354ea1a852051bb26f01bf6ca7f1ab45 Mon Sep 17 00:00:00 2001 From: Dirk Julich Date: Wed, 20 May 2026 17:38:48 +0200 Subject: [PATCH] [AAP-74343] Set AWX_COLLECT_HOST_QUERIES in query discovery tests The TestExternalQueryDiscovery tests exercise the host query scanning path, which now requires AWX_COLLECT_HOST_QUERIES=1 in the environment. Co-Authored-By: Claude Opus 4.6 --- awx/main/tests/unit/test_indirect_query_discovery.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/tests/unit/test_indirect_query_discovery.py b/awx/main/tests/unit/test_indirect_query_discovery.py index 159873614e..338906f9d8 100644 --- a/awx/main/tests/unit/test_indirect_query_discovery.py +++ b/awx/main/tests/unit/test_indirect_query_discovery.py @@ -274,7 +274,7 @@ class TestExternalQueryDiscovery: @mock.patch('awx.playbooks.library.indirect_instance_count.list_collections') @mock.patch('awx.playbooks.library.indirect_instance_count.files') @mock.patch('awx.playbooks.library.indirect_instance_count.find_external_query_with_fallback') - @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts'}) + @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts', 'AWX_COLLECT_HOST_QUERIES': '1'}) def test_precedence_embedded_over_external(self, mock_fallback, mock_files, mock_list_collections): """AC7.1: Embedded query takes precedence when both embedded and external exist.""" from awx.playbooks.library.indirect_instance_count import CallbackModule @@ -300,7 +300,7 @@ class TestExternalQueryDiscovery: @mock.patch('awx.playbooks.library.indirect_instance_count.list_collections') @mock.patch('awx.playbooks.library.indirect_instance_count.files') @mock.patch('awx.playbooks.library.indirect_instance_count.find_external_query_with_fallback') - @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts'}) + @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts', 'AWX_COLLECT_HOST_QUERIES': '1'}) def test_external_query_when_embedded_missing(self, mock_fallback, mock_files, mock_list_collections): """AC7.2: External query is discovered when embedded query is missing.""" from awx.playbooks.library.indirect_instance_count import CallbackModule @@ -329,7 +329,7 @@ class TestExternalQueryDiscovery: @mock.patch('awx.playbooks.library.indirect_instance_count.list_collections') @mock.patch('awx.playbooks.library.indirect_instance_count.files') @mock.patch('awx.playbooks.library.indirect_instance_count.find_external_query_with_fallback') - @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts'}) + @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts', 'AWX_COLLECT_HOST_QUERIES': '1'}) def test_no_query_when_both_missing(self, mock_fallback, mock_files, mock_list_collections): """AC7.3: No query is used when both embedded and external queries are missing.""" from awx.playbooks.library.indirect_instance_count import CallbackModule @@ -352,7 +352,7 @@ class TestExternalQueryDiscovery: @mock.patch('awx.playbooks.library.indirect_instance_count.list_collections') @mock.patch('awx.playbooks.library.indirect_instance_count.files') @mock.patch('awx.playbooks.library.indirect_instance_count.find_external_query_with_fallback') - @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts'}) + @mock.patch.dict('os.environ', {'AWX_ISOLATED_DATA_DIR': '/tmp/artifacts', 'AWX_COLLECT_HOST_QUERIES': '1'}) def test_info_log_on_fallback(self, mock_fallback, mock_files, mock_list_collections): """AC7.8: Log message is emitted when fallback version is used.