summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-08 16:49:57 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-08 16:49:57 +0200
commit684d78cfb022955f1553e10029bf8e4ee2848c75 (patch)
tree69000077cbee04c8acce0e779c4ff363aa3c2008
parent966ed31c72e47a871683e70cb34cd3a13e9bc906 (diff)
parent3d995843ce0e5f0c1f5875a6092369bfe83cbec0 (diff)
downloadcpython-git-684d78cfb022955f1553e10029bf8e4ee2848c75.tar.gz
#11298: merge from 3.2.
-rw-r--r--Doc/library/unittest.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 047d458d29..8366bab394 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -277,9 +277,11 @@ Test Discovery
.. 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::