summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-03-11 22:46:37 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-03-11 22:46:37 (GMT)
commit600e08dc1c9c36187f0452878e61a717885797de (patch)
tree07eb52e2beecd85378574174e5e92acb3b708424
parent86deec19170fe6d0e4e454b2ddab9c2e7cd2869d (diff)
parented5d95b76bd9a3584038bf578bac8f473a47e4c4 (diff)
downloadcpython-600e08dc1c9c36187f0452878e61a717885797de.zip
cpython-600e08dc1c9c36187f0452878e61a717885797de.tar.gz
cpython-600e08dc1c9c36187f0452878e61a717885797de.tar.bz2
Merge #20030: doc that TestLoader.discover returns a TestSuite.
-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 77323bd..690c98b 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1624,11 +1624,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