diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 09:32:48 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 09:32:48 (GMT) |
| commit | 0930228aee0fd70066b5d7fe6afd41c2bce0dca6 (patch) | |
| tree | 38aee6527a2a3e27010b9eaa801ccedc34104b1e /Doc/library/unittest.rst | |
| parent | 21946afe3f2d21ac6b50021802e503686abb9347 (diff) | |
| download | cpython-0930228aee0fd70066b5d7fe6afd41c2bce0dca6.zip cpython-0930228aee0fd70066b5d7fe6afd41c2bce0dca6.tar.gz cpython-0930228aee0fd70066b5d7fe6afd41c2bce0dca6.tar.bz2 | |
Merged revisions 84945 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line
#9911: doc copyedits.
........
Diffstat (limited to 'Doc/library/unittest.rst')
| -rw-r--r-- | Doc/library/unittest.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 0ef2e03..6fc49eb 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -634,7 +634,7 @@ The following decorators implement test skipping and expected failures: .. function:: skipUnless(condition, reason) - Skip the decoratored test unless *condition* is true. + Skip the decorated test unless *condition* is true. .. function:: expectedFailure @@ -1523,8 +1523,8 @@ Loading and running tests .. attribute:: expectedFailures - A list contaning 2-tuples of :class:`TestCase` instances and strings - holding formatted tracebacks. Each tuple represents a expected failures + A list containing 2-tuples of :class:`TestCase` instances and strings + holding formatted tracebacks. Each tuple represents an expected failure of the test case. .. attribute:: unexpectedSuccesses |