mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Disallowed importing concrete models without an application.

Browse Source 
Removed fragile algorithm to find which application a model belongs to.

Fixed #21680, #21719. Refs #21794.
This commit is contained in:
Aymeric Augustin
2015-02-09 22:41:57 +01:00
parent c7a6996df7
commit 1b8af4cfa0
4 changed files with 32 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/test_runner/tests.py
View File

@@ -151,30 +151,11 @@ class ManageCommandTests(unittest.TestCase):
testrunner='test_runner.NonExistentRunner')
class CustomOptionsTestRunner(DiscoverRunner):
def __init__(self, verbosity=1, interactive=True, failfast=True, option_a=None, option_b=None, option_c=None, **kwargs):
super(CustomOptionsTestRunner, self).__init__(verbosity=verbosity, interactive=interactive,
failfast=failfast)
self.option_a = option_a
self.option_b = option_b
self.option_c = option_c
@classmethod
def add_arguments(cls, parser):
parser.add_argument('--option_a', '-a', action='store', dest='option_a', default='1'),
parser.add_argument('--option_b', '-b', action='store', dest='option_b', default='2'),
parser.add_argument('--option_c', '-c', action='store', dest='option_c', default='3'),
def run_tests(self, test_labels, extra_tests=None, **kwargs):
print("%s:%s:%s" % (self.option_a, self.option_b, self.option_c))
class CustomTestRunnerOptionsTests(AdminScriptTestCase):
def setUp(self):
settings = {
'TEST_RUNNER': '\'test_runner.tests.CustomOptionsTestRunner\'',
'TEST_RUNNER': '\'test_runner.runner.CustomOptionsTestRunner\'',
}
self.write_settings('settings.py', sdict=settings)