cpython: d5f5a6f514f2 (original) (raw)

Mercurial > cpython

changeset 100511:d5f5a6f514f2

#25687: merge with 3.5. [#25687]

Ezio Melotti ezio.melotti@gmail.com
date	Sun, 13 Mar 2016 09:40:55 +0200
parents	fe3f304ff666(current diff)cecd39887faa(diff)
children	1cdb4cb01e22
files	Misc/ACKS
diffstat	2 files changed, 7 insertions(+), 4 deletions(-)[+] [-] Doc/library/unittest.rst 10 Misc/ACKS 1

line wrap: on

line diff

--- 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`[](#l1.7)

 or :exc:`SkipTest`, raised by this method will be considered an error rather than a[](#l1.8)

 test failure.  This method will only be called if the :meth:`setUp` succeeds,[](#l1.9)

 regardless of the outcome of the test method. The default implementation does nothing.[](#l1.10)

 careful about checking internal state.  Any exception, other than[](#l1.11)

 :exc:`AssertionError` or :exc:`SkipTest`, raised by this method will be[](#l1.12)

 considered an additional error rather than a test failure (thus increasing[](#l1.13)

 the total number of reported errors). This method will only be called if[](#l1.14)

 the :meth:`setUp` succeeds, regardless of the outcome of the test method.[](#l1.15)

 The default implementation does nothing.[](#l1.16)

.. method:: setUpClass()

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -1092,6 +1092,7 @@ M. Papillon Peter Parente Alexandre Parenteau Dan Parisien +HyeSoo Park William Park Claude Paroz Heikki Partanen