From d23f5eb5405fb98ef14a189458b69158a1cbd533 Mon Sep 17 00:00:00 2001 From: Roger Hunwicks Date: Thu, 28 Feb 2019 14:02:46 +0200 Subject: [PATCH] Support custom ROOT_URLCONF in tests - fixes #566 --- mayan/apps/common/tests/base.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mayan/apps/common/tests/base.py b/mayan/apps/common/tests/base.py index cf67bf5ec7..7c38069b1e 100644 --- a/mayan/apps/common/tests/base.py +++ b/mayan/apps/common/tests/base.py @@ -1,5 +1,7 @@ from __future__ import absolute_import, unicode_literals +import importlib +from django.conf import settings from django.conf.urls import url from django.contrib.auth import get_user_model from django.http import HttpResponse @@ -42,15 +44,15 @@ class GenericViewTestCase(BaseTestCase): self.has_test_view = False def tearDown(self): - from mayan.urls import urlpatterns + urlconf = importlib.import_module(settings.ROOT_URLCONF) self.client.logout() if self.has_test_view: - urlpatterns.pop(0) + urlconf.urlpatterns.pop(0) super(GenericViewTestCase, self).tearDown() def add_test_view(self, test_object): - from mayan.urls import urlpatterns + urlconf = importlib.import_module(settings.ROOT_URLCONF) def test_view(request): template = Template('{{ object }}') @@ -59,7 +61,7 @@ class GenericViewTestCase(BaseTestCase): ) return HttpResponse(template.render(context=context)) - urlpatterns.insert(0, url(TEST_VIEW_URL, test_view, name=TEST_VIEW_NAME)) + urlconf.urlpatterns.insert(0, url(TEST_VIEW_URL, test_view, name=TEST_VIEW_NAME)) clear_url_caches() self.has_test_view = True