diff --git a/app/devops/serializers/git_group.py b/app/devops/serializers/git_group.py index 47423ca9..a724efb9 100644 --- a/app/devops/serializers/git_group.py +++ b/app/devops/serializers/git_group.py @@ -22,7 +22,7 @@ class BaseSerializer(serializers.ModelSerializer): return str( item ) url = serializers.HyperlinkedIdentityField( - view_name="v2:devops:_api_v2_git_group-detail", format="html" + view_name="v2:devops:_api_gitgroup-detail", format="html" ) diff --git a/app/tests/fixtures/model_checkin.py b/app/tests/fixtures/model_checkin.py index b820b972..b2a84122 100644 --- a/app/tests/fixtures/model_checkin.py +++ b/app/tests/fixtures/model_checkin.py @@ -13,29 +13,15 @@ def model_checkin(): @pytest.fixture( scope = 'class') def kwargs_checkin(django_db_blocker, - kwargs_centurionmodel, model_software + kwargs_centurionmodel, kwargs_featureflag ): - - with django_db_blocker.unblock(): - - random_str = str(datetime.datetime.now(tz=datetime.timezone.utc)) - - software = model_software.objects.create( - organization = kwargs_centurionmodel['organization'], - name = 'ci' + random_str - ) - - kwargs = { - **kwargs_centurionmodel.copy(), - 'software': software, - 'version': '1.20.300', - 'deployment_id': 'rand deploymentid', - 'feature': 'a feature', - } + kwargs = { + **kwargs_centurionmodel.copy(), + 'software': kwargs_featureflag['software'], + 'version': '1.20.300', + 'deployment_id': 'rand deploymentid', + 'feature': 'a feature', + } yield kwargs.copy() - - with django_db_blocker.unblock(): - - software.delete() diff --git a/pyproject.toml b/pyproject.toml index e926325a..2db2f72d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1097,6 +1097,7 @@ markers = [ "module_accounting: Selects all tests from module accounting.", "module_api: Selects all tests from module api.", "module_assistance: Selects all tests from module assistance.", + "model_checkin: Selects tests for the checkin model", "module_config_management: Selects all tests from module config management.", "module_core: Selects all tests from module core.", "module_devops: Selects all tests from module devops.",