summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt7
-rw-r--r--docs/topics/testing.txt23
2 files changed, 30 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 6aac4ced92..46b7307613 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -964,6 +964,13 @@ information.
Use the :djadminopt:`--failfast` option to stop running tests and report the failure
immediately after a test fails.
+.. versionadded:: 1.4
+.. django-admin-option:: --testrunner
+
+The :djandminopt:`--testrunner` option can be used to control the test runner
+class that is used to execute tests. If this value is provided, it overrides
+the value provided by the :setting:`TEST_RUNNER` setting.
+
testserver <fixture fixture ...>
--------------------------------
diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index a21ad6a77e..6595c51957 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing.txt
@@ -1744,6 +1744,29 @@ set up, execute and tear down the test suite.
write your own test runner, ensure accept and handle the ``**kwargs``
parameter.
+ .. versionadded:: 1.4
+
+ Your test runner may also define additional command-line options.
+ If you add an ``option_list`` attribute to a subclassed test runner,
+ those options will be added to the list of command-line options that
+ the :djadmin:`test` command can use.
+
+
+Attributes
+~~~~~~~~~~
+
+
+.. attribute:: DjangoTestSuiteRunner.option_list
+
+ .. versionadded:: 1.4
+
+ This is the tuple of ``optparse`` options which will be fed into the
+ management command's ``OptionParser`` for parsing arguments. See the
+ documentation for Python's ``optparse`` module for more details.
+
+Methods
+~~~~~~~
+
.. method:: DjangoTestSuiteRunner.run_tests(test_labels, extra_tests=None, **kwargs)
Run the test suite.