summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-01-27 20:58:07 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-01-27 20:58:07 (GMT)
commit176d6c40e06b768966038cff9b95a06b19938ac1 (patch)
treee539efc6aa0684ec19858c92158bc06819595777 /Doc
parent1f0b6586387a3dae59cf28239effe14f1333229a (diff)
downloadcpython-176d6c40e06b768966038cff9b95a06b19938ac1.zip
cpython-176d6c40e06b768966038cff9b95a06b19938ac1.tar.gz
cpython-176d6c40e06b768966038cff9b95a06b19938ac1.tar.bz2
Merged revisions 77796 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77796 | ezio.melotti | 2010-01-27 22:25:11 +0200 (Wed, 27 Jan 2010) | 1 line #7765: typos ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index a9438a8..c9b36e1 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -107,7 +107,7 @@ qualified class or method names.
You can run tests with more detail (higher verbosity) by passing in the -v flag::
- python-m unittest -v test_module
+ python -m unittest -v test_module
For a list of all the command line options::
@@ -149,8 +149,8 @@ The ``discover`` sub-command has the following options:
The -s, -p, & -t options can be passsed in as positional arguments. The
following two command lines are equivalent::
- python -m unittest -s project_directory -p '*_test.py'
- python -m unittest project_directory '*_test.py'
+ python -m unittest discover -s project_directory -p '*_test.py'
+ python -m unittest discover project_directory '*_test.py'
Test modules and packages can customize test loading and discovery by through
the `load_tests protocol`_.
@@ -1436,7 +1436,7 @@ Loading and running tests
.. method:: stopTestRun(test)
- Called once before any tests are executed.
+ Called once after all tests are executed.
.. versionadded:: 2.7