diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-10 11:54:21 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-10 11:54:21 (GMT) |
| commit | a2087d0a5aa33530ff220013af53e9b9947df485 (patch) | |
| tree | c1d9b4dcdf48db89a76c66c7a653097e5beb2220 | |
| parent | d2dee34a851eb6b10adb586861aeb66752e364c5 (diff) | |
| parent | 40dcb1d2870bfb605cd262b857f9df5af1291d06 (diff) | |
| download | cpython-a2087d0a5aa33530ff220013af53e9b9947df485.zip cpython-a2087d0a5aa33530ff220013af53e9b9947df485.tar.gz cpython-a2087d0a5aa33530ff220013af53e9b9947df485.tar.bz2 | |
Merge from 3.2.
| -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 |