Ticket #15675: ticket15675-3.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:

docs/topics/testing.txt

@@ -1645 +1645 @@
     write your own test runner, ensure accept and handle the ``**kwargs``
     parameter.
 
+    .. versionadded:: development
+
+    Your test runner may define some command-line options which will be fed
+    into ``test`` management command's ``OptionParser``. If you need such
+    functionality, see the ``option_list`` attribute. Options you declare
+    will be provided to your test runner's constructor as additional keyword
+    arguments.
+
+Attributes
+~~~~~~~~~~
+
+.. versionadded:: development
+
+.. attribute:: DjangoTestSuiteRunner.option_list
+
+    This is the tuple of ``optparse`` options which will be fed into the management
+    command's ``OptionParser`` for parsing arguments. 
+
+Methods
+~~~~~~~
+
 .. method:: DjangoTestSuiteRunner.run_tests(test_labels, extra_tests=None, **kwargs)
 
     Run the test suite.

tests/regressiontests/test_runner/tests.py

@@ -2 +2 @@
 Tests for django test runner
 """
 import StringIO
+from optparse import make_option
 
 from django.core.exceptions import ImproperlyConfigured
 from django.test import simple
 from django.utils import unittest
 
+from regressiontests.admin_scripts.tests import AdminScriptTestCase
+
 class DjangoTestRunnerTests(unittest.TestCase):
 
     def test_failfast(self):
@@ -118 +121 @@
 
         self.assertRaises(ImproperlyConfigured, simple.dependency_ordered, raw, dependencies=dependencies)
 
+class CustomOptionsTestRunner(simple.DjangoTestSuiteRunner):
+    option_list = (
+        make_option('--option_a','-a', action='store', dest='option_a', default='1'),
+        make_option('--option_b','-b', action='store', dest='option_b', default='2'),
+        make_option('--option_c','-c', action='store', dest='option_c', default='3'),
+    )
+
+    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
+
+    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': '\'regressiontests.test_runner.tests.CustomOptionsTestRunner\'',
+        }
+        self.write_settings('settings.py', sdict=settings)
+
+    def tearDown(self):
+        self.remove_settings('settings.py')
+
+    def test_default_options(self):  
+        args = ['test', '--settings=settings']
+        out, err = self.run_django_admin(args)
+        self.assertNoOutput(err)
+        self.assertOutput(out, '1:2:3')
+
+    def test_default_and_given_options(self):  
+        args = ['test', '--settings=settings', '--option_b=foo']
+        out, err = self.run_django_admin(args)
+        self.assertNoOutput(err)
+        self.assertOutput(out, '1:foo:3')
+
+    def test_option_name_and_value_separated(self):  
+        args = ['test', '--settings=settings', '--option_b', 'foo']
+        out, err = self.run_django_admin(args)
+        self.assertNoOutput(err)
+        self.assertOutput(out, '1:foo:3')
+
+    def test_all_options_given(self):  
+        args = ['test', '--settings=settings', '--option_a=bar', '--option_b=foo', '--option_c=31337']
+        out, err = self.run_django_admin(args)
+        self.assertNoOutput(err)
+        self.assertOutput(out, 'bar:foo:31337')
+