mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

#25687: merge with 3.5.

Browse source
This commit is contained in:
Ezio Melotti 2016-03-13 09:40:55 +02:00
commit 0ce835fc7e
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Doc/library/unittest.rst
View file

@ -680,10 +680,12 @@ Test cases
Method called immediately after the test method has been called and the Method called immediately after the test method has been called and the
result recorded. This is called even if the test method raised an result recorded. This is called even if the test method raised an
exception, so the implementation in subclasses may need to be particularly exception, so the implementation in subclasses may need to be particularly
careful about checking internal state. Any exception, other than :exc:`AssertionError` careful about checking internal state. Any exception, other than
or :exc:`SkipTest`, raised by this method will be considered an error rather than a :exc:`AssertionError` or :exc:`SkipTest`, raised by this method will be
test failure. This method will only be called if the :meth:`setUp` succeeds, considered an additional error rather than a test failure (thus increasing
regardless of the outcome of the test method. The default implementation does nothing. 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() .. method:: setUpClass()

1
Misc/ACKS
View file

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