Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 853947a

Browse files
committed
Fix versionadded:: 2.x merges.
1 parent 9306602 commit 853947a

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

Doc/library/unittest.rst

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ For a list of all the command line options::
113113

114114
python -m unittest -h
115115

116-
.. versionchanged:: 2.7
116+
.. versionchanged:: 3.2
117117
In earlier versions it was only possible to run individual test methods and
118118
not modules or classes.
119119

@@ -126,7 +126,7 @@ tests in a project or just a subset.
126126
Test Discovery
127127
--------------
128128

129-
.. versionadded:: 2.7
129+
.. versionadded:: 3.2
130130

131131
unittest supports simple test discovery. For a project's tests to be
132132
compatible with test discovery they must all be importable from the top level
@@ -1084,7 +1084,7 @@ Test cases
10841084
If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called,
10851085
then any cleanup functions added will still be called.
10861086

1087-
.. versionadded:: 2.7
1087+
.. versionadded:: 3.2
10881088

10891089

10901090
.. method:: doCleanups()
@@ -1100,7 +1100,7 @@ Test cases
11001100
:meth:`doCleanups` pops methods off the stack of cleanup
11011101
functions one at a time, so it can be called at any time.
11021102

1103-
.. versionadded:: 2.7
1103+
.. versionadded:: 3.2
11041104

11051105

11061106
.. class:: FunctionTestCase(testFunc, setUp=None, tearDown=None, description=None)
@@ -1179,7 +1179,7 @@ Grouping tests
11791179
(for example when counting tests or comparing for equality)
11801180
so the tests returned must be the same for repeated iterations.
11811181

1182-
.. versionchanged:: 2.7
1182+
.. versionchanged:: 3.2
11831183
In earlier versions the :class:`TestSuite` accessed tests directly rather
11841184
than through iteration, so overriding :meth:`__iter__` wasn't sufficient
11851185
for providing tests.
@@ -1227,7 +1227,7 @@ Loading and running tests
12271227
load the tests. This allows modules to customize test loading.
12281228
This is the `load_tests protocol`_.
12291229

1230-
.. versionchanged:: 2.7
1230+
.. versionchanged:: 3.2
12311231
Support for ``load_tests`` added.
12321232

12331233

@@ -1297,7 +1297,8 @@ Loading and running tests
12971297
``load_tests`` does not need to pass this argument in to
12981298
``loader.discover()``.
12991299

1300-
.. versionadded:: 2.7
1300+
.. versionadded:: 3.2
1301+
13011302

13021303
The following attributes of a :class:`TestLoader` can be configured either by
13031304
subclassing or assignment on an instance:
@@ -1431,14 +1432,14 @@ Loading and running tests
14311432

14321433
Called once before any tests are executed.
14331434

1434-
.. versionadded:: 2.7
1435+
.. versionadded:: 3.2
14351436

14361437

14371438
.. method:: stopTestRun(test)
14381439

14391440
Called once after all tests are executed.
14401441

1441-
.. versionadded:: 2.7
1442+
.. versionadded:: 3.2
14421443

14431444

14441445
.. method:: addError(test, err)
@@ -1546,15 +1547,15 @@ Loading and running tests
15461547
Calling ``main`` actually returns an instance of the ``TestProgram`` class.
15471548
This stores the result of the tests run as the ``result`` attribute.
15481549

1549-
.. versionchanged:: 2.7
1550+
.. versionchanged:: 3.2
15501551
The ``exit`` and ``verbosity`` parameters were added.
15511552

15521553

15531554
load_tests Protocol
15541555
###################
15551556

15561557

1557-
.. versionadded:: 2.7
1558+
.. versionadded:: 3.2
15581559

15591560

15601561
Modules or packages can customize how tests are loaded from them during normal

0 commit comments

Comments
 (0)