Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #12638 -- Minor documentation cleanups around the new class-bas…

…ed test runners. Thanks to Ramiro Morales for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9aba6f807ebaa4aca9885142ce2d6f5e162cb8cd 1 parent be26f1a
@freakboy3742 freakboy3742 authored
Showing with 9 additions and 6 deletions.
  1. +5 −2 docs/ref/settings.txt
  2. +4 −4 docs/topics/testing.txt
View
7 docs/ref/settings.txt
@@ -1409,9 +1409,12 @@ misspelled) variables. See :ref:`invalid-template-variables`..
TEST_RUNNER
-----------
-Default: ``'django.test.simple.run_tests'``
+Default: ``'django.test.simple.DjangoTestSuiteRunner'``
-The name of the method to use for starting the test suite. See
+.. versionchanged:: 1.2
+ Prior to 1.2, test runners were a function, not a class.
+
+The name of the class to use for starting the test suite. See
:ref:`topics-testing`.
.. _Testing Django Applications: ../testing/
View
8 docs/topics/testing.txt
@@ -1247,8 +1247,8 @@ testing behavior. This behavior involves:
#. Performing global post-test teardown.
-If you define your own test runner method and point :setting:`TEST_RUNNER` at
-that method, Django will execute your test runner whenever you run
+If you define your own test runner class and point :setting:`TEST_RUNNER` at
+that class, Django will execute your test runner whenever you run
``./manage.py test``. In this way, it is possible to use any test framework
that can be executed from Python code, or to modify the Django test execution
process to satisfy whatever testing requirements you may have.
@@ -1290,7 +1290,7 @@ set up, execute and tear down the test suite.
write your own test runner, ensure accept and handle the ``**kwargs``
parameter.
-.. method:: DjangoTestSuiteRunner.run_tests(test_labels, extra_tests=[])
+.. method:: DjangoTestSuiteRunner.run_tests(test_labels, extra_tests=None)
Run the test suite.
@@ -1315,7 +1315,7 @@ set up, execute and tear down the test suite.
Sets up the test environment ready for testing.
-.. method:: DjangoTestSuiteRunner.build_suite(test_labels, extra_tests=[])
+.. method:: DjangoTestSuiteRunner.build_suite(test_labels, extra_tests=None)
Constructs a test suite that matches the test labels provided.
Please sign in to comment.
Something went wrong with that request. Please try again.