summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2016-03-13 09:40:09 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2016-03-13 09:40:09 +0200
commitf9b2e2efe0803ddabb0c4cc74b11e2f25486a409 (patch)
tree4a29777d54bf31797e200bcd956762312f90f9cc
parent17040db61fde6344ea79dac84b8699114430f667 (diff)
downloadpython-f9b2e2efe0803ddabb0c4cc74b11e2f25486a409.tar.gz
#25687: clarify that errors in tearDown increase the total number of reported errors. Initial patch by HyeSoo Park.
-rw-r--r--Doc/library/unittest.rst10
-rw-r--r--Misc/ACKS1
2 files changed, 7 insertions, 4 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 810eed6644..cacbb3c336 100644
--- 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 20c9ce89c0..58230e845c 100644
--- 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