diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 11:51:54 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 11:51:54 (GMT) |
| commit | bcc484e6d63b0551ce072101dd0421a8912c5be1 (patch) | |
| tree | 983d462c40d18ff9e4420d4d53e72a5989689461 /Doc/library/unittest.rst | |
| parent | 243d02f6304db4c8c39ac1c1a6d232f206b94caa (diff) | |
| download | cpython-bcc484e6d63b0551ce072101dd0421a8912c5be1.zip cpython-bcc484e6d63b0551ce072101dd0421a8912c5be1.tar.gz cpython-bcc484e6d63b0551ce072101dd0421a8912c5be1.tar.bz2 | |
Merged revisions 74062 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r74062 | alexandre.vassalotti | 2009-07-17 13:43:26 +0200 (Fr, 17 Jul 2009) | 37 lines
Merged revisions 73665,73693,73704-73705,73707,73712-73713,73824 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73665 | alexandre.vassalotti | 2009-06-28 21:01:51 -0400 (Sun, 28 Jun 2009) | 2 lines
Update docstrings for sys.getdlopenflags() and sys.setdlopenflags().
........
r73693 | jesse.noller | 2009-06-29 14:20:34 -0400 (Mon, 29 Jun 2009) | 1 line
Bug 5906: add a documentation note for unix daemons vs. multiprocessing daemons
........
r73704 | georg.brandl | 2009-06-30 12:15:43 -0400 (Tue, 30 Jun 2009) | 1 line
#6376: fix copy-n-paste oversight.
........
r73705 | georg.brandl | 2009-06-30 12:17:28 -0400 (Tue, 30 Jun 2009) | 1 line
#6374: add a bit of explanation about shell=True on Windows.
........
r73707 | georg.brandl | 2009-06-30 12:35:11 -0400 (Tue, 30 Jun 2009) | 1 line
#6371: fix link targets.
........
r73712 | ezio.melotti | 2009-06-30 18:51:06 -0400 (Tue, 30 Jun 2009) | 1 line
Fixed defaultTestCase -> defaultTestResult
........
r73713 | ezio.melotti | 2009-06-30 18:56:16 -0400 (Tue, 30 Jun 2009) | 1 line
Fixed a backslash that was not supposed to be there
........
r73824 | ezio.melotti | 2009-07-03 21:18:08 -0400 (Fri, 03 Jul 2009) | 1 line
#6398 typo: versio. -> version.
........
................
Diffstat (limited to 'Doc/library/unittest.rst')
| -rw-r--r-- | Doc/library/unittest.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 32d0952..9a57a0b 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -580,8 +580,8 @@ Test cases Run the test, collecting the result into the test result object passed as *result*. If *result* is omitted or :const:`None`, a temporary result - object is created (by calling the :meth:`defaultTestCase` method) and - used; this result object is not returned to :meth:`run`'s caller. + object is created (by calling the :meth:`defaultTestResult` method) and + used. The result object is not returned to :meth:`run`'s caller. The same effect may be had by simply calling the :class:`TestCase` instance. |