Issue #18566: Clarify unittest setUp, tearDown doc. Patch by Nitika Agarwal.

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 91f61f4f6112657788d167981184f600256a0cd3..999ae6a0899175e79edca1bdec4d886f813a4500 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -719,9 +719,9 @@ Test cases
    .. method:: setUp()
 
       Method called to prepare the test fixture.  This is called immediately
-      before calling the test method; 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()
@@ -729,10 +729,10 @@ 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 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 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.
 
 
    .. method:: setUpClass()

diff --git a/Misc/ACKS b/Misc/ACKS
index 581432028732b633386d60c16d375403c6432a23..3af3ff401dae1ec5807b999fee2ac655d4d900e2 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -18,6 +18,7 @@ David Abrahams
 Marc Abramowitz
 Ron Adam
 Ali Afshar
+Nitika Agarwal
 Jim Ahlstrom
 Farhan Ahmad
 Matthew Ahrens