diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 08:56:53 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 08:56:53 (GMT) |
| commit | 4b05466e25b686fed9084452e88e7a8b7728a843 (patch) | |
| tree | 6119674ce9a9904c8ecd0f8de2b3e9a9214e467d /Doc/library/unittest.rst | |
| parent | 57a5e3f0e288b70267297511f5af2c92721d7e2d (diff) | |
| download | cpython-4b05466e25b686fed9084452e88e7a8b7728a843.zip cpython-4b05466e25b686fed9084452e88e7a8b7728a843.tar.gz cpython-4b05466e25b686fed9084452e88e7a8b7728a843.tar.bz2 | |
Merged revisions 84945 via svnmerge from
svn+ssh://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 560c3f9..d88b823 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -504,7 +504,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 @@ -1241,8 +1241,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 |