diff -r a7093386efaf Doc/library/unittest.rst --- a/Doc/library/unittest.rst Sat Mar 12 10:53:09 2016 +0200 +++ b/Doc/library/unittest.rst Sat Mar 12 13:08:35 2016 +0200 @@ -670,9 +670,9 @@ .. method:: setUp() Method called to prepare the test fixture. This is called immediately - before calling the test method; other than :exc:`AssertionError` or :exc:`SkipTest`, - any exception raised by this method will be considered an error rather than - a test failure. The default implementation does nothing. + before calling the test method; other than :exc:`AssertionError` or :exc: + `SkipTest`, any exception raised by this method will be considered an + error rather than a test failure. The default implementation does nothing. .. method:: tearDown() @@ -680,10 +680,12 @@ Method called immediately after the test method has been called and the result recorded. This is called even if the test method raised an exception, so the implementation in subclasses may need to be particularly - careful about checking internal state. Any exception, other than :exc:`AssertionError` - or :exc:`SkipTest`, raised by this method will be considered an error rather than a - test failure. This method will only be called if the :meth:`setUp` succeeds, - regardless of the outcome of the test method. The default implementation does nothing. + careful about checking internal state. Any exception, other than :exc: + `AssertionError` or :exc:`SkipTest`, raised by this method will be + considered an additional error rather than a test failure (thus increasing + the total number of error counts). This method will only be called if the + :meth:`set Up` succeeds, regardless of the outcome of the test method. The + default implementation does nothing. .. method:: setUpClass()