Ticket #15675: ticket15675.patch

django/core/management/commands/test.py

@@ -1 +1 @@
 from django.core.management.base import BaseCommand
+from django.test.utils import get_runner
+from django.conf import settings
 from optparse import make_option
 import sys
 
+TestRunner = get_runner(settings)
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--noinput', action='store_false', dest='interactive', default=True,
             help='Tells Django to NOT prompt the user for input of any kind.'),
         make_option('--failfast', action='store_true', dest='failfast', default=False,
             help='Tells Django to stop running the test suite after first failed test.')
-    )
+    ) + getattr(TestRunner, 'option_list', ())
     help = 'Runs the test suite for the specified applications, or the entire site if no apps are specified.'
     args = '[appname ...]'
 
     requires_model_validation = False
 
     def handle(self, *test_labels, **options):
-        from django.conf import settings
-        from django.test.utils import get_runner
-
-        verbosity = int(options.get('verbosity', 1))
-        interactive = options.get('interactive', True)
-        failfast = options.get('failfast', False)
-        TestRunner = get_runner(settings)
+        options['verbosity'] = int(options.get('verbosity', 1))
+        options.setdefault('interactive', True)
+        options.setdefault('failfast', False)
 
         if hasattr(TestRunner, 'func_name'):
             # Pre 1.2 test runners were just functions,
@@ -31 +31 @@
                 'Function-based test runners are deprecated. Test runners should be classes with a run_tests() method.',
                 DeprecationWarning
             )
-            failures = TestRunner(test_labels, verbosity=verbosity, interactive=interactive)
+            failures = TestRunner(test_labels, **options)
         else:
-            test_runner = TestRunner(verbosity=verbosity, interactive=interactive, failfast=failfast)
+            test_runner = TestRunner(**options)
             failures = test_runner.run_tests(test_labels)
 
         if failures: