summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-11-26 23:46:18 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-11-26 23:46:18 (GMT)
commit76338ec37d823ffc490c3dce4e442b9d99691128 (patch)
tree1e4989460e4ebda33e1138bfe1ceca5450c4ae7f
parent8acb67c0597d6326e1e160dc9e1127c9a53259c1 (diff)
downloadcpython-76338ec37d823ffc490c3dce4e442b9d99691128.zip
cpython-76338ec37d823ffc490c3dce4e442b9d99691128.tar.gz
cpython-76338ec37d823ffc490c3dce4e442b9d99691128.tar.bz2
Rewrap long lines + minor edits
-rw-r--r--Doc/library/unittest.rst22
1 files changed, 11 insertions, 11 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 4fc06fc..f2c6dee 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -191,7 +191,7 @@ documentation explores the full feature set from first principles.
.. _unittest-command-line-interface:
-Command Line Interface
+Command-Line Interface
----------------------
The unittest module can be used from the command line to run tests from
@@ -221,8 +221,8 @@ For a list of all the command-line options::
not modules or classes.
-failfast, catch and buffer command-line options
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Command-line options
+~~~~~~~~~~~~~~~~~~~~
:program:`unittest` supports these command-line options:
@@ -247,7 +247,8 @@ failfast, catch and buffer command-line options
Stop the test run on the first error or failure.
.. versionadded:: 3.2
- The command-line options :option:`-c`, :option:`-b` and :option:`-f` were added.
+ The command-line options :option:`-b`, :option:`-c` and :option:`-f`
+ were added.
The command line can also be used for test discovery, for running all of the
tests in a project or just a subset.
@@ -1891,7 +1892,7 @@ Loading and running tests
>>> main(module='test_module', exit=False)
The ``failfast``, ``catchbreak`` and ``buffer`` parameters have the same
- effect as the `failfast, catch and buffer command-line options`_.
+ effect as the same-name `command-line options`_.
Calling ``main`` actually returns an instance of the ``TestProgram`` class.
This stores the result of the tests run as the ``result`` attribute.
@@ -2055,12 +2056,11 @@ Signal Handling
---------------
The :option:`-c/--catch <unittest -c>` command-line option to unittest,
-along with the ``catchbreak``
-parameter to :func:`unittest.main()`, provide more friendly handling of
-control-C during a test run. With catch break behavior enabled control-C will
-allow the currently running test to complete, and the test run will then end
-and report all the results so far. A second control-c will raise a
-:exc:`KeyboardInterrupt` in the usual way.
+along with the ``catchbreak`` parameter to :func:`unittest.main()`, provide
+more friendly handling of control-C during a test run. With catch break
+behavior enabled control-C will allow the currently running test to complete,
+and the test run will then end and report all the results so far. A second
+control-c will raise a :exc:`KeyboardInterrupt` in the usual way.
The control-c handling signal handler attempts to remain compatible with code or
tests that install their own :const:`signal.SIGINT` handler. If the ``unittest``