cpython: 6e3551d37b03 (original) (raw)

Mercurial > cpython

changeset 68347:6e3551d37b03 3.2

Port a couple of changes from 3.1.

Ezio Melotti ezio.melotti@gmail.com
date	Thu, 10 Mar 2011 13:46:50 +0200
parents	605c74139754(current diff)cb3a925de1bd(diff)
children	3599798bcbd2 0c595f4bbfc8
files	Doc/library/unittest.rst
diffstat	1 files changed, 5 insertions(+), 5 deletions(-)[+] [-] Doc/library/unittest.rst 10

line wrap: on

line diff

--- 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[](#l1.7)
```

```
 .. versionadded:: 3.1[](#l1.8)
```

.. 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[](#l1.16)
```

```
 .. versionadded:: 3.1[](#l1.17)
```

.. 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[](#l1.25)
```

```
 .. versionadded:: 3.1[](#l1.26)
```

.. method:: stopTestRun(test) Called once after all tests are executed.

```
 .. versionadded:: 3.2[](#l1.33)
```

```
 .. versionadded:: 3.1[](#l1.34)
```

.. method:: addError(test, err) @@ -1922,7 +1922,7 @@ Loading and running tests .. function:: main(module='main', defaultTest=None, argv=None, testRunner=None, [](#l1.41)

              testLoader=unittest.loader.defaultTestLoader, exit=True, verbosity=1, \[](#l1.42)

              testLoader=unittest.defaultTestLoader, exit=True, verbosity=1, \[](#l1.43)
              failfast=None, catchbreak=None, buffer=None, warnings=None)[](#l1.44)

A command-line program that runs a set of tests; this is primarily for making