summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-03-11 22:46:00 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-03-11 22:46:00 (GMT)
commited5d95b76bd9a3584038bf578bac8f473a47e4c4 (patch)
treecdd0618162e1ba0eb2be7f45860072a802346f61 /Doc
parent8e4b3c7f55766080c3df325e5d06da3c38bb6561 (diff)
downloadcpython-ed5d95b76bd9a3584038bf578bac8f473a47e4c4.zip
cpython-ed5d95b76bd9a3584038bf578bac8f473a47e4c4.tar.gz
cpython-ed5d95b76bd9a3584038bf578bac8f473a47e4c4.tar.bz2
#20030: doc that TestLoader.discover returns a TestSuite.
Patch by Lita Cho.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index f4e554d..fdc9409 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1489,11 +1489,11 @@ Loading and running tests
.. method:: discover(start_dir, pattern='test*.py', top_level_dir=None)
- Find and return all test modules from the specified start directory,
- recursing into subdirectories to find them. Only test files that match
- *pattern* will be loaded. (Using shell style pattern matching.) Only
- module names that are importable (i.e. are valid Python identifiers) will
- be loaded.
+ Find all the test modules by recursing into subdirectories from the
+ specified start directory, and return a TestSuite object containing them.
+ Only test files that match *pattern* will be loaded. (Using shell style
+ pattern matching.) Only module names that are importable (i.e. are valid
+ Python identifiers) will be loaded.
All test modules must be importable from the top level of the project. If
the start directory is not the top level directory then the top level