Merge #20030: doc that TestLoader.discover returns a TestSuite.

This commit is contained in:
R David Murray 2014-03-11 18:46:37 -04:00
commit 600e08dc1c
1 changed files with 5 additions and 5 deletions

View File

@ -1624,11 +1624,11 @@ Loading and running tests
.. method:: discover(start_dir, pattern='test*.py', top_level_dir=None) .. method:: discover(start_dir, pattern='test*.py', top_level_dir=None)
Find and return all test modules from the specified start directory, Find all the test modules by recursing into subdirectories from the
recursing into subdirectories to find them. Only test files that match specified start directory, and return a TestSuite object containing them.
*pattern* will be loaded. (Using shell style pattern matching.) Only Only test files that match *pattern* will be loaded. (Using shell style
module names that are importable (i.e. are valid Python identifiers) will pattern matching.) Only module names that are importable (i.e. are valid
be loaded. Python identifiers) will be loaded.
All test modules must be importable from the top level of the project. If 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 the start directory is not the top level directory then the top level