#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 9647b4b665367aad6978d99920f6f4e422c879db..e076be6e74e44e81eb4f401e9332920fa268332b 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -680,10 +680,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 c8a6efdb8a9a8dcf319758c3f24957911d899f54..1cfdb54a930640527c011b65aac9721021a9d951 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1087,6 +1087,7 @@ M. Papillon
 Peter Parente
 Alexandre Parenteau
 Dan Parisien
+HyeSoo Park
 William Park
 Claude Paroz
 Heikki Partanen