Ticket #11077: test_combine_urlconfs_poc.diff

django/test/testcases.py

@@ -1 +1 @@
 import re
+import sys
+import imp
 import unittest
 from urlparse import urlsplit, urlunsplit
 from xml.dom.minidom import parseString, Node
@@ -13 +15 @@
 from django.test.client import Client
 from django.utils import simplejson
 from django.utils.encoding import smart_str
+from django.utils.importlib import import_module
 
 try:
     all
@@ -242 +245 @@
     def _urlconf_setup(self):
         if hasattr(self, 'urls'):
             self._old_root_urlconf = settings.ROOT_URLCONF
-            settings.ROOT_URLCONF = self.urls
+            if settings.TEST_COMBINE_URLCONFS:
+                # Put the module instance of self.urls into specified_urlconf
+                if not isinstance(self.urls, basestring):
+                    specified_urlconf = self.urls
+                else:
+                    specified_urlconf = import_module(self.urls)
+                # Choose between settings.TEST_COMBINE_URLCONFS_WITH and settings.ROOT_URLCONF
+                urls_to_combine = settings.TEST_COMBINE_URLCONFS_WITH or settings.ROOT_URLCONF
+                # Do the above action, this time with urls_to_combine
+                if not isinstance(urls_to_combine, basestring):
+                    extra_urlconf = urls_to_combine
+                else:
+                    extra_urlconf = import_module(urls_to_combine)
+                # Create a dynamic URLconf module that combines the urlpatterns
+                # of specified_urlconf and extra_urlconf
+                dynamic_urlconf_name = 'dynamic_urls'
+                dynamic_urlconf = imp.new_module(dynamic_urlconf_name)
+                dynamic_urlconf.urlpatterns = specified_urlconf.urlpatterns + \
+                        extra_urlconf.urlpatterns
+                # Also combine handler404 and 500, favoring specified_urlconf
+                handler404 = getattr(specified_urlconf, 'handler404', None) or \
+                        getattr(extra_urlconf, 'handler404', None)
+                if handler404:
+                    dynamic_urlconf.handler404 = handler404
+                handler500 = getattr(specified_urlconf, 'handler404', None) or \
+                        getattr(extra_urlconf, 'handler404', None)
+                if handler500:
+                    dynamic_urlconf.handler500 = handler500
+                # Add our dynamic_urlconf to sys.modules and set 
+                # settings.ROOT_URLCONF to it
+                sys.modules[dynamic_urlconf_name] = dynamic_urlconf
+                settings.ROOT_URLCONF = dynamic_urlconf
+            else:
+                settings.ROOT_URLCONF = self.urls
             clear_url_caches()
 
     def __call__(self, result=None):

django/conf/global_settings.py

@@ -501 +501 @@
 TEST_DATABASE_CHARSET = None
 TEST_DATABASE_COLLATION = None
 
+# If true, the testing framework will combine the URLconf instead of overwrite
+# it if a TestCase.urls is specified
+TEST_COMBINE_URLCONFS = False
+
+# The URLconf to be combined with the TestCase.urls setting. If None, the 
+# ROOT_URLCONF specified in settings.py will be used instead.
+TEST_COMBINE_URLCONFS_WITH = None
+
 ############
 # FIXTURES #
 ############