Merge branch 'clean_up_urls_cache'

Author: pelme

pytest_django/plugin.py

@@ -339,7 +339,7 @@ def _django_set_urlconf(request):
     if marker:
         skip_if_no_django()
         import django.conf
-        from django.core.urlresolvers import clear_url_caches
+        from django.core.urlresolvers import clear_url_caches, set_urlconf
 
         validate_urls(marker)
         original_urlconf = django.conf.settings.ROOT_URLCONF
@@ -348,6 +348,10 @@ def _django_set_urlconf(request):
 
         def restore():
             django.conf.settings.ROOT_URLCONF = original_urlconf
+            # Copy the pattern from
+            # https://github.com/django/django/blob/master/django/test/signals.py#L152
+            clear_url_caches()
+            set_urlconf(None)
 
         request.addfinalizer(restore)
 

tests/test_urls.py

@@ -3,7 +3,6 @@
 
 from pytest_django_test.compat import force_text
 
-pytestmark = pytest.mark.urls('pytest_django_test.urls_overridden')
 
 try:
     from django.core.urlresolvers import is_valid_path
@@ -24,11 +23,43 @@ def is_valid_path(path, urlconf=None):
             return False
 
 
+@pytest.mark.urls('pytest_django_test.urls_overridden')
 def test_urls():
     assert settings.ROOT_URLCONF == 'pytest_django_test.urls_overridden'
     assert is_valid_path('/overridden_url/')
 
 
+@pytest.mark.urls('pytest_django_test.urls_overridden')
 def test_urls_client(client):
     response = client.get('/overridden_url/')
     assert force_text(response.content) == 'Overridden urlconf works!'
+
+
+def test_urls_cache_is_cleared(testdir):
+    testdir.makepyfile(myurls="""
+        from django.conf.urls import patterns, url
+
+        def fake_view(request):
+            pass
+
+        urlpatterns = patterns('', url(r'first/$', fake_view, name='first'))
+    """)
+
+
+    testdir.makepyfile("""
+        from django.core.urlresolvers import reverse, NoReverseMatch
+        import pytest
+
+        @pytest.mark.urls('myurls')
+        def test_something():
+            reverse('first')
+
+
+        def test_something_else():
+            with pytest.raises(NoReverseMatch):
+                reverse('first')
+
+    """)
+
+    result = testdir.runpytest()
+    assert result.ret == 0