summaryrefslogtreecommitdiff
path: root/django/test/utils.py
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-08-10 22:26:34 +0000
committerRamiro Morales <cramm0@gmail.com>2011-08-10 22:26:34 +0000
commit27eb8bbfd09594e3f0f40391ca1a06b896acebdf (patch)
treef88848e1007fe109df4acad42c515f5d1362527f /django/test/utils.py
parent4fc3741ee88493a7884708fb4a9170da31637294 (diff)
downloaddjango-27eb8bbfd09594e3f0f40391ca1a06b896acebdf.tar.gz
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
Diffstat (limited to 'django/test/utils.py')
-rw-r--r--django/test/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index dbb1c20163..88da9d54c5 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -194,8 +194,8 @@ class override_settings(object):
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()