[Python-checkins] cpython (merge 3.3 -> default): Merge #20030: doc that TestLoader.discover returns a TestSuite.

[r.david.murray]

http://hg.python.org/cpython/rev/ecc26a050384
changeset:   89593:ecc26a050384
parent:      89589:0d230ad6b51a
parent:      89592:71df53af61ec
user:        R David Murray <rdmurray at bitdance.com>
date:        Tue Mar 11 18:46:37 2014 -0400
summary:
  Merge #20030: doc that TestLoader.discover returns a TestSuite.

files:
  Doc/library/unittest.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1624,11 +1624,11 @@
 
    .. 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

-- 
Repository URL: http://hg.python.org/cpython