summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-05-07 06:47:08 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-05-07 06:47:08 (GMT)
commit7168879eb247545944568dc38fcc9c26a5e5ca30 (patch)
tree758cfe4680ca27263349ad59c9a1f7e500dc1ecc /Doc
parent6e6bee8d084eb4693e73d55465de6a63d07009b4 (diff)
parent9c939bceeb0074bfc177041daaee75d8da5d1676 (diff)
downloadcpython-7168879eb247545944568dc38fcc9c26a5e5ca30.zip
cpython-7168879eb247545944568dc38fcc9c26a5e5ca30.tar.gz
cpython-7168879eb247545944568dc38fcc9c26a5e5ca30.tar.bz2
#17871: merge with 3.3.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 766122b..26245b5 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1850,7 +1850,8 @@ Loading and running tests
instead of repeatedly creating new instances.
-.. class:: TextTestRunner(stream=None, descriptions=True, verbosity=1, runnerclass=None, warnings=None)
+.. class:: TextTestRunner(stream=None, descriptions=True, verbosity=1, failfast=False, \
+ buffer=False, resultclass=None, warnings=None)
A basic test runner implementation that outputs results to a stream. If *stream*
is ``None``, the default, :data:`sys.stderr` is used as the output stream. This class