summaryrefslogtreecommitdiffstats
path: root/Doc/library/unittest.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-09-07 12:20:03 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-09-07 12:20:03 (GMT)
commit0cd94428add1e4cd5281297795a0edd22be90465 (patch)
treeb593ceed988b2952b461f271a753b5d9670e47f3 /Doc/library/unittest.rst
parentb034eee711807c69a23241085b641212b2d1264a (diff)
parente2202365eddfa7a2af88920d272f9a4a3f77f9ad (diff)
downloadcpython-0cd94428add1e4cd5281297795a0edd22be90465.zip
cpython-0cd94428add1e4cd5281297795a0edd22be90465.tar.gz
cpython-0cd94428add1e4cd5281297795a0edd22be90465.tar.bz2
#18894: merge with 3.3.
Diffstat (limited to 'Doc/library/unittest.rst')
-rw-r--r--Doc/library/unittest.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 412bee7..6401d30 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1674,8 +1674,7 @@ Loading and running tests
A list containing 2-tuples of :class:`TestCase` instances and strings
holding formatted tracebacks. Each tuple represents a test where a failure
- was explicitly signalled using the :meth:`TestCase.fail\*` or
- :meth:`TestCase.assert\*` methods.
+ was explicitly signalled using the :meth:`TestCase.assert\*` methods.
.. attribute:: skipped