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.
........
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 @@
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 @@
: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 @@
(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 @@
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 @@
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.