From 9858bc251c083b86d5f205c23ed8da6f278b05e7 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 1 Oct 2025 14:22:36 -0400 Subject: [PATCH] Delete ServiceID hack from DAB --- awx/main/tests/functional/conftest.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py index 8c48ac3a2335..ef43058001a5 100644 --- a/awx/main/tests/functional/conftest.py +++ b/awx/main/tests/functional/conftest.py @@ -5,7 +5,6 @@ from unittest import mock import urllib.parse from unittest.mock import PropertyMock -import importlib # Django from django.urls import resolve @@ -16,8 +15,6 @@ from django.core.serializers.json import DjangoJSONEncoder from django.db.backends.sqlite3.base import SQLiteCursorWrapper -from django.db.models.signals import post_migrate - from awx.main.migrations._dab_rbac import setup_managed_role_definitions # AWX @@ -47,30 +44,12 @@ from awx.main.models.workflow import WorkflowJobTemplate from awx.main.models.ad_hoc_commands import AdHocCommand from awx.main.models.execution_environments import ExecutionEnvironment -from awx.main.utils import is_testing logger = logging.getLogger(__name__) __SWAGGER_REQUESTS__ = {} -# HACK: the dab_resource_registry app required ServiceID in migrations which checks do not run -dab_rr_initial = importlib.import_module('ansible_base.resource_registry.migrations.0001_initial') - - -def create_service_id(app_config, apps=global_apps, **kwargs): - try: - apps.get_model("dab_resource_registry", "ServiceID") - except LookupError: - logger.info('Looks like reverse migration, not creating resource registry ServiceID') - return - dab_rr_initial.create_service_id(apps, None) - - -if is_testing(): - post_migrate.connect(create_service_id) - - @pytest.fixture(scope="session") def swagger_autogen(requests=__SWAGGER_REQUESTS__): return requests