mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge from 3.2.

Browse source
This commit is contained in:
Ezio Melotti 2011-03-10 13:54:21 +02:00
commit a2087d0a5a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Doc/library/unittest.rst
View file

@ -1408,7 +1408,7 @@ Test cases
If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called, If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called,
then any cleanup functions added will still be called. then any cleanup functions added will still be called.
.. versionadded:: 3.2 .. versionadded:: 3.1
.. method:: doCleanups() .. method:: doCleanups()
@ -1424,7 +1424,7 @@ Test cases
:meth:`doCleanups` pops methods off the stack of cleanup :meth:`doCleanups` pops methods off the stack of cleanup
functions one at a time, so it can be called at any time. functions one at a time, so it can be called at any time.
.. versionadded:: 3.2 .. versionadded:: 3.1
.. class:: FunctionTestCase(testFunc, setUp=None, tearDown=None, description=None) .. class:: FunctionTestCase(testFunc, setUp=None, tearDown=None, description=None)
@ -1801,14 +1801,14 @@ Loading and running tests
Called once before any tests are executed. Called once before any tests are executed.
.. versionadded:: 3.2 .. versionadded:: 3.1
.. method:: stopTestRun(test) .. method:: stopTestRun(test)
Called once after all tests are executed. Called once after all tests are executed.
.. versionadded:: 3.2 .. versionadded:: 3.1
.. method:: addError(test, err) .. method:: addError(test, err)
@ -1922,7 +1922,7 @@ Loading and running tests
.. function:: main(module='__main__', defaultTest=None, argv=None, testRunner=None, \ .. function:: main(module='__main__', defaultTest=None, argv=None, testRunner=None, \
testLoader=unittest.loader.defaultTestLoader, exit=True, verbosity=1, \ testLoader=unittest.defaultTestLoader, exit=True, verbosity=1, \
failfast=None, catchbreak=None, buffer=None, warnings=None) failfast=None, catchbreak=None, buffer=None, warnings=None)
A command-line program that runs a set of tests; this is primarily for making A command-line program that runs a set of tests; this is primarily for making