#25687: merge with 3.5.

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

View file

@ -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()

View file

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