From e4b012feebac7e9b8619e54791fd9bba2f6930b6 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 7 Sep 2013 16:10:07 -0400
Subject: [PATCH] Fixed #21068 -- Added some docs for DiscoverRunner
Thanks jcd.
---
docs/topics/testing/advanced.txt | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index d8d59c68728..dc41747ae45 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -298,11 +298,13 @@ Defining a test runner
.. currentmodule:: django.test.runner
+.. versionadded:: 1.6
+
A test runner is a class defining a ``run_tests()`` method. Django ships
-with a ``DiscoverRunner`` class that defines the default Django
-testing behavior. This class defines the ``run_tests()`` entry point,
-plus a selection of other methods that are used to by ``run_tests()`` to
-set up, execute and tear down the test suite.
+with a ``DiscoverRunner`` class that defines the default Django testing
+behavior. This class defines the ``run_tests()`` entry point, plus a
+selection of other methods that are used to by ``run_tests()`` to set up,
+execute and tear down the test suite.
.. class:: DiscoverRunner(pattern='test*.py', top_level=None, verbosity=1, interactive=True, failfast=True, **kwargs)
@@ -339,6 +341,13 @@ set up, execute and tear down the test suite.
Attributes
~~~~~~~~~~
+.. attribute:: DiscoverRunner.test_loader
+
+ This is the class that loads tests, whether from TestCases or modules or
+ otherwise and bundles them into test suites for the runner to execute.
+ By default it is set to ``unittest.defaultTestLoader``. You can override
+ this attribute if your tests are going to be loaded in unusual ways.
+
.. attribute:: DiscoverRunner.option_list
This is the tuple of ``optparse`` options which will be fed into the