[Python-checkins] (merge 3.2 -> default): #11298: merge from 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/fa23f323d747
changeset:   68330:fa23f323d747
parent:      68326:a69ef22b60e3
parent:      68329:bbf8a8a1af17
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Mar 08 16:49:57 2011 +0200
summary:
  #11298: merge from 3.2.

files:
  

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -277,9 +277,11 @@
 
 .. versionadded:: 3.2
 
-Unittest supports simple test discovery. For a project's tests to be
-compatible with test discovery they must all be importable from the top level
-directory of the project (in other words, they must all be in Python packages).
+Unittest supports simple test discovery. In order to be compatible with test
+discovery, all of the test files must be :ref:`modules <tut-modules>` or
+:ref:`packages <tut-packages>` importable from the top-level directory of
+the project (this means that their filenames must be valid
+:ref:`identifiers <identifiers>`).
 
 Test discovery is implemented in :meth:`TestLoader.discover`, but can also be
 used from the command line. The basic command-line usage is::

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