Skip to content

Commit 93d7517

Browse files
authored
chore: make debug setting true for tests (#884)
1 parent 94ba96c commit 93d7517

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

tests/integration/api/test_fallback_handler.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from unittest import mock
22

33
import pytest
4+
from django.test import override_settings
45
from rest_framework import status
56
from rest_framework.test import APIClient
67

@@ -20,19 +21,19 @@ def raise_exception(self, request):
2021
"aap_eda.api.views.project.ProjectViewSet.list", new=raise_exception
2122
)
2223
def test_debug_unexpected_exception(admin_client: APIClient, settings):
23-
settings.DEBUG = True
24-
with pytest.raises(FallbackException):
25-
admin_client.get(f"{api_url_v1}/projects/")
24+
with override_settings(DEBUG=True):
25+
with pytest.raises(FallbackException):
26+
admin_client.get(f"{api_url_v1}/projects/")
2627

2728

2829
@pytest.mark.django_db
2930
@mock.patch(
3031
"aap_eda.api.views.project.ProjectViewSet.list", new=raise_exception
3132
)
3233
def test_non_debug_unexpected_exception(admin_client: APIClient, settings):
33-
settings.DEBUG = False
34-
response = admin_client.get(f"{api_url_v1}/projects/")
35-
assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
34+
with override_settings(DEBUG=False):
35+
response = admin_client.get(f"{api_url_v1}/projects/")
36+
assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
3637

37-
data = response.json()
38-
assert data["detail"].startswith("Unexpected server error")
38+
data = response.json()
39+
assert data["detail"].startswith("Unexpected server error")

tests/integration/conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from ansible_base.rbac.models import DABPermission, RoleDefinition
2424
from django.conf import settings
2525
from django.contrib.contenttypes.models import ContentType
26+
from django.test import override_settings
2627
from rest_framework.test import APIClient
2728

2829
from aap_eda.core import enums, models
@@ -770,6 +771,13 @@ def default_activation_instance_logs(
770771
"""
771772

772773

774+
@pytest.fixture(autouse=True)
775+
def use_debug_setting():
776+
with override_settings(DEBUG=True):
777+
yield
778+
779+
780+
# fixture for a running redis server
773781
@pytest.fixture
774782
def default_credential_type() -> models.CredentialType:
775783
"""Return a default Credential Type."""

tests/integration/dab_rbac/test_crud_permissions.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from ansible_base.rbac import permission_registry
1717
from ansible_base.rbac.models import DABPermission, RoleDefinition
1818
from django.contrib.contenttypes.models import ContentType
19-
from django.test import override_settings
2019
from django.urls.exceptions import NoReverseMatch
2120
from rest_framework.reverse import reverse
2221

@@ -39,7 +38,6 @@ def get_detail_url(obj, skip_if_not_found=False):
3938
raise
4039

4140

42-
@override_settings(DEBUG=True)
4341
@pytest.mark.django_db
4442
@pytest.mark.parametrize("model", permission_registry.all_registered_models)
4543
def test_add_permissions(
@@ -125,7 +123,6 @@ def test_add_permissions(
125123
assert default_user.has_obj_perm(obj, "view")
126124

127125

128-
@override_settings(DEBUG=True)
129126
@pytest.mark.django_db
130127
@pytest.mark.parametrize("model", permission_registry.all_registered_models)
131128
def test_view_permissions(
@@ -147,7 +144,6 @@ def test_view_permissions(
147144
assert response.status_code == 200, response.data
148145

149146

150-
@override_settings(DEBUG=True)
151147
@pytest.mark.django_db
152148
@pytest.mark.parametrize("model", permission_registry.all_registered_models)
153149
def test_change_permissions(

tests/integration/dab_rbac/test_organization.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import pytest
1616
from django.apps import apps
1717
from django.core.exceptions import FieldDoesNotExist
18-
from django.test import override_settings
1918
from django.urls.exceptions import NoReverseMatch
2019
from rest_framework.reverse import reverse
2120

@@ -35,7 +34,6 @@ def has_field(cls, field_name):
3534
]
3635

3736

38-
@override_settings(DEBUG=True)
3937
@pytest.mark.django_db
4038
@pytest.mark.parametrize("model", ORG_MODELS)
4139
def test_create_with_default_org(cls_factory, model, admin_client, request):
@@ -72,7 +70,6 @@ def test_create_with_default_org(cls_factory, model, admin_client, request):
7270
assert obj.organization.name == "Default"
7371

7472

75-
@override_settings(DEBUG=True)
7673
@pytest.mark.django_db
7774
@pytest.mark.parametrize("model", ORG_MODELS)
7875
def test_create_with_custom_org(

tests/integration/test_sanity.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from django.conf import settings
2+
3+
4+
def test_debug_enabled_for_testing():
5+
assert settings.DEBUG is True

0 commit comments

Comments
 (0)