Changeset 7809 for django/branches/newforms-admin/django/test/testcases.py

Timestamp:

06/30/08 10:38:16 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/django/test/testcases.py (modified) (4 diffs)

django/branches/newforms-admin/django/test/testcases.py

@@ -5 +5 @@
-from django.http import QueryDict
-from django.db import transaction
+from django.conf import settings
-from django.core import mail
-from django.core.management import call_command
-from django.test import _doctest as doctest
-from django.test.client import Client
+from django.core.urlresolvers import clear_url_caches
-
-normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)
@@ -55 +57 @@
-            * If the Test Case class has a 'fixtures' member, installing the 
-              named fixtures.
+            * If the Test Case class has a 'urls' member, replace the
+              ROOT_URLCONF with it.
-            * Clearing the mail test outbox.
-        """
@@ -62 +66 @@
-            # that we're using *args and **kwargs together.
-            call_command('loaddata', *self.fixtures, **{'verbosity': 0})
+        if hasattr(self, 'urls'):
+            self._old_root_urlconf = settings.ROOT_URLCONF
+            settings.ROOT_URLCONF = self.urls
+            clear_url_caches()
-        mail.outbox = []
-
@@ -80 +88 @@
-            return
-        super(TestCase, self).__call__(result)
+        try:
+            self._post_teardown()
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except Exception:
+            import sys
+            result.addError(self, sys.exc_info())
+            return
+
+    def _post_teardown(self):
+        """ Performs any post-test things. This includes:
+
+            * Putting back the original ROOT_URLCONF if it was changed.
+        """
+        if hasattr(self, '_old_root_urlconf'):
+            settings.ROOT_URLCONF = self._old_root_urlconf
+            clear_url_caches()
-
-    def assertRedirects(self, response, expected_url, status_code=302,