Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Made override_settings also work with TransactionTestCase when acting…

… as a class decorator.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 27eb8bbfd09594e3f0f40391ca1a06b896acebdf 1 parent 4fc3741
@ramiro ramiro authored
View
4 django/test/utils.py
@@ -194,8 +194,8 @@ def __exit__(self, exc_type, exc_value, traceback):
self.disable()
def __call__(self, test_func):
- from django.test import TestCase
- if isinstance(test_func, type) and issubclass(test_func, TestCase):
+ from django.test import TransactionTestCase
+ if isinstance(test_func, type) and issubclass(test_func, TransactionTestCase):
class inner(test_func):
def _pre_setup(innerself):
self.enable()
View
14 tests/regressiontests/settings_tests/tests.py
@@ -1,11 +1,23 @@
from __future__ import with_statement
import os
from django.conf import settings, global_settings
-from django.test import TestCase, signals
+from django.test import TransactionTestCase, TestCase, signals
from django.test.utils import override_settings
# @override_settings(TEST='override')
+class FullyDecoratedTranTestCase(TransactionTestCase):
+
+ def test_override(self):
+ self.assertEqual(settings.TEST, 'override')
+
+ @override_settings(TEST='override2')
+ def test_method_override(self):
+ self.assertEqual(settings.TEST, 'override2')
+
+FullyDecoratedTranTestCase = override_settings(TEST='override')(FullyDecoratedTranTestCase)
+
+# @override_settings(TEST='override')
class FullyDecoratedTestCase(TestCase):
def test_override(self):
Please sign in to comment.
Something went wrong with that request. Please try again.