diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-03-21 07:31:49 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-03-21 07:31:49 (GMT) |
| commit | 8da105e6a9e7ee570bc711fd279d925ba9edd526 (patch) | |
| tree | e734d289a737275a7124a7a1eec5de7271d7dea1 /Doc/library/unittest.rst | |
| parent | ed244d37c5cc274117533ec7c9f506e94b6d9ef5 (diff) | |
| download | cpython-8da105e6a9e7ee570bc711fd279d925ba9edd526.zip cpython-8da105e6a9e7ee570bc711fd279d925ba9edd526.tar.gz cpython-8da105e6a9e7ee570bc711fd279d925ba9edd526.tar.bz2 | |
Merged revisions 77888 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r77888 | georg.brandl | 2010-01-31 20:53:23 +0200 (Sun, 31 Jan 2010) | 1 line
Fix versionadded:: 2.x merges.
........
Diffstat (limited to 'Doc/library/unittest.rst')
| -rw-r--r-- | Doc/library/unittest.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 6fda488..a5fc066 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -993,7 +993,7 @@ Test cases If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called, then any cleanup functions added will still be called. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. method:: doCleanups() @@ -1009,7 +1009,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:: 2.7 + .. versionadded:: 3.2 .. class:: FunctionTestCase(testFunc, setUp=None, tearDown=None, description=None) @@ -1088,7 +1088,7 @@ Grouping tests (for example when counting tests or comparing for equality) so the tests returned must be the same for repeated iterations. - .. versionchanged:: 2.7 + .. versionchanged:: 3.2 In earlier versions the :class:`TestSuite` accessed tests directly rather than through iteration, so overriding :meth:`__iter__` wasn't sufficient for providing tests. @@ -1302,14 +1302,14 @@ Loading and running tests Called once before any tests are executed. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. method:: stopTestRun(test) Called once before any tests are executed. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. method:: addError(test, err) @@ -1411,5 +1411,5 @@ Loading and running tests Calling ``main`` actually returns an instance of the ``TestProgram`` class. This stores the result of the tests run as the ``result`` attribute. - .. versionchanged:: 2.7 + .. versionchanged:: 3.2 The ``exit`` parameter was added. |