Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
........
This commit is contained in:
Ezio Melotti 2010-03-21 07:31:49 +00:00
parent ed244d37c5
commit 8da105e6a9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Doc/library/unittest.rst
View File

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