Skip to content

Commit 9858bc2

Browse files
committed
Delete ServiceID hack from DAB
1 parent 0d18308 commit 9858bc2

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

awx/main/tests/functional/conftest.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from unittest import mock
66
import urllib.parse
77
from unittest.mock import PropertyMock
8-
import importlib
98

109
# Django
1110
from django.urls import resolve
@@ -16,8 +15,6 @@
1615
from django.core.serializers.json import DjangoJSONEncoder
1716
from django.db.backends.sqlite3.base import SQLiteCursorWrapper
1817

19-
from django.db.models.signals import post_migrate
20-
2118
from awx.main.migrations._dab_rbac import setup_managed_role_definitions
2219

2320
# AWX
@@ -47,30 +44,12 @@
4744
from awx.main.models.workflow import WorkflowJobTemplate
4845
from awx.main.models.ad_hoc_commands import AdHocCommand
4946
from awx.main.models.execution_environments import ExecutionEnvironment
50-
from awx.main.utils import is_testing
5147

5248
logger = logging.getLogger(__name__)
5349

5450
__SWAGGER_REQUESTS__ = {}
5551

5652

57-
# HACK: the dab_resource_registry app required ServiceID in migrations which checks do not run
58-
dab_rr_initial = importlib.import_module('ansible_base.resource_registry.migrations.0001_initial')
59-
60-
61-
def create_service_id(app_config, apps=global_apps, **kwargs):
62-
try:
63-
apps.get_model("dab_resource_registry", "ServiceID")
64-
except LookupError:
65-
logger.info('Looks like reverse migration, not creating resource registry ServiceID')
66-
return
67-
dab_rr_initial.create_service_id(apps, None)
68-
69-
70-
if is_testing():
71-
post_migrate.connect(create_service_id)
72-
73-
7453
@pytest.fixture(scope="session")
7554
def swagger_autogen(requests=__SWAGGER_REQUESTS__):
7655
return requests

0 commit comments

Comments
 (0)