#25687: clarify that errors in tearDown increase the total number of reported errors...

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 810eed6644a2dd07ac1c252a70fce6e84c5f1c5a..cacbb3c336b60dfe68ae3658db8935f719c37ced 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -720,10 +720,12 @@ Test cases
       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 reported errors). This method will only be called if
+      the :meth:`setUp` succeeds, regardless of the outcome of the test method.
+      The default implementation does nothing.
 
 
    .. method:: setUpClass()

diff --git a/Misc/ACKS b/Misc/ACKS
index 20c9ce89c006b0d57fc7604ee8b30734d6b5c36d..58230e845c0775578b8f4e4abfe10783ca3602c6 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1034,6 +1034,7 @@ M. Papillon
 Peter Parente
 Alexandre Parenteau
 Dan Parisien
+HyeSoo Park
 William Park
 Heikki Partanen
 Harri Pasanen