summaryrefslogtreecommitdiffstats
path: root/Doc/library/unittest.rst
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-01-21 10:00:03 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-01-21 10:00:03 (GMT)
commita2a90717540e2853e1b9181b19585db529ae2e86 (patch)
tree3a79d6e3a5ba6ed676c70d964c0ee08ac6400e6c /Doc/library/unittest.rst
parent3242577a0875c08a7fb714628a7f0ee58813cece (diff)
parent41b2404dabfdc7b470b991b1a8b4a945feaa5f1f (diff)
downloadcpython-a2a90717540e2853e1b9181b19585db529ae2e86.zip
cpython-a2a90717540e2853e1b9181b19585db529ae2e86.tar.gz
cpython-a2a90717540e2853e1b9181b19585db529ae2e86.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/library/unittest.rst')
-rw-r--r--Doc/library/unittest.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 0798cf1..8938312 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -376,7 +376,7 @@ The simplest :class:`TestCase` subclass will simply override the
widget = Widget('The widget')
self.assertEqual(widget.size(), (50, 50), 'incorrect default size')
-Note that in order to test something, we use the one of the :meth:`assert\*`
+Note that in order to test something, we use one of the :meth:`assert\*`
methods provided by the :class:`TestCase` base class. If the test fails, an
exception will be raised, and :mod:`unittest` will identify the test case as a
:dfn:`failure`. Any other exceptions will be treated as :dfn:`errors`. This