Skip to content

Commit

Permalink
Use settings fixture in tests
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
chrismeyersfsu committed May 30, 2024
1 parent 08e1454 commit ceafa14
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions awx/main/tests/functional/test_named_url.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
import pytest

from django.conf import settings

from awx.api.versioning import reverse
from awx.main.middleware import URLModificationMiddleware
from awx.main.models import ( # noqa
Expand Down Expand Up @@ -121,7 +119,7 @@ def test_notification_template(get, admin_user):


@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)
url = reverse('api:instance_detail', kwargs={'pk': test_instance.pk})
response = get(url, user=admin_user, expect=200)
Expand Down Expand Up @@ -230,7 +228,7 @@ class TestConvertNamedUrl:
"/api/foobar/v2/organizations/1/inventories/",
),
)
def test_noop(self, url):
def test_noop(self, url, settings):
settings.OPTIONAL_API_URLPATTERN_PREFIX = ''
assert URLModificationMiddleware._convert_named_url(url) == url

Expand Down

0 comments on commit ceafa14

Please sign in to comment.