diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-10 11:46:50 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-10 11:46:50 (GMT) |
| commit | 40dcb1d2870bfb605cd262b857f9df5af1291d06 (patch) | |
| tree | ba70413d106ded0abf8dc4966bfabcf31aa77bb4 /Doc/library | |
| parent | 35db8a80c19aef7418ed4e1572b962cba6577625 (diff) | |
| parent | 2d1e88a4d1ccc1096afea8603a6e39251a6cff3d (diff) | |
| download | cpython-40dcb1d2870bfb605cd262b857f9df5af1291d06.zip cpython-40dcb1d2870bfb605cd262b857f9df5af1291d06.tar.gz cpython-40dcb1d2870bfb605cd262b857f9df5af1291d06.tar.bz2 | |
Port a couple of changes from 3.1.
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/unittest.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 8366bab..a3de29b 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -1408,7 +1408,7 @@ Test cases If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called, then any cleanup functions added will still be called. - .. versionadded:: 3.2 + .. versionadded:: 3.1 .. method:: doCleanups() @@ -1424,7 +1424,7 @@ Test cases :meth:`doCleanups` pops methods off the stack of cleanup 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) @@ -1801,14 +1801,14 @@ Loading and running tests Called once before any tests are executed. - .. versionadded:: 3.2 + .. versionadded:: 3.1 .. method:: stopTestRun(test) Called once after all tests are executed. - .. versionadded:: 3.2 + .. versionadded:: 3.1 .. method:: addError(test, err) @@ -1922,7 +1922,7 @@ Loading and running tests .. 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) A command-line program that runs a set of tests; this is primarily for making |