p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also copy `__module__` to our dynamically created TestCase subclass when override_settings acts as a class decorator. 

Otherwise, an error in e.g. a test in tests/modeltests/proxy_model_inheritance/tests.py
was being reported as:

ERROR: test_table_exists (django.test.utils.ProxyModelInheritanceTests)

Refs #16672 and [16650].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-09-04 22:51:53 +00:00
parent efd682e436
commit 2b4341d532
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/test/utils.py
View File

@ -211,6 +211,7 @@ class override_settings(object):
{ {
'_pre_setup': _pre_setup, '_pre_setup': _pre_setup,
'_post_teardown': _post_teardown, '_post_teardown': _post_teardown,
'__module__': test_func.__module__,
}) })
else: else:
@wraps(test_func) @wraps(test_func)

3
tests/regressiontests/settings_tests/tests.py
View File

@ -18,6 +18,9 @@ class FullyDecoratedTranTestCase(TransactionTestCase):
def test_decorated_testcase_name(self): def test_decorated_testcase_name(self):
self.assertEquals(FullyDecoratedTranTestCase.__name__, 'FullyDecoratedTranTestCase') self.assertEquals(FullyDecoratedTranTestCase.__name__, 'FullyDecoratedTranTestCase')
def test_decorated_testcase_module(self):
self.assertEquals(FullyDecoratedTranTestCase.__module__, __name__)
FullyDecoratedTranTestCase = override_settings(TEST='override')(FullyDecoratedTranTestCase) FullyDecoratedTranTestCase = override_settings(TEST='override')(FullyDecoratedTranTestCase)
# @override_settings(TEST='override') # @override_settings(TEST='override')