External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-17 08:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Use settings fixture in tests

Browse Source 
* Otherwise, settings value changes bleeds over into other tests.
* Remove django.conf settings import so that we do not accidentally
  forget to use the settings fixture.
This commit is contained in:
Chris Meyers
2024-05-30 14:01:53 -04:00
committed by Chris Meyers
parent 08e1454098
commit ceafa14c9d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tests/functional/test_named_url.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import pytest import pytest
from django.conf import settings
from awx.api.versioning import reverse from awx.api.versioning import reverse
from awx.main.middleware import URLModificationMiddleware from awx.main.middleware import URLModificationMiddleware
from awx.main.models import ( # noqa from awx.main.models import ( # noqa
@@ -121,7 +119,7 @@ def test_notification_template(get, admin_user):
@pytest.mark.django_db @pytest.mark.django_db
def test_instance(get, admin_user): def test_instance(get, admin_user, settings):
test_instance = Instance.objects.create(uuid=settings.SYSTEM_UUID, hostname="localhost", capacity=100) test_instance = Instance.objects.create(uuid=settings.SYSTEM_UUID, hostname="localhost", capacity=100)
url = reverse('api:instance_detail', kwargs={'pk': test_instance.pk}) url = reverse('api:instance_detail', kwargs={'pk': test_instance.pk})
response = get(url, user=admin_user, expect=200) response = get(url, user=admin_user, expect=200)
@@ -230,7 +228,7 @@ class TestConvertNamedUrl:
"/api/foobar/v2/organizations/1/inventories/", "/api/foobar/v2/organizations/1/inventories/",
), ),
) )
def test_noop(self, url): def test_noop(self, url, settings):
settings.OPTIONAL_API_URLPATTERN_PREFIX = '' settings.OPTIONAL_API_URLPATTERN_PREFIX = ''
assert URLModificationMiddleware._convert_named_url(url) == url assert URLModificationMiddleware._convert_named_url(url) == url