mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72506 | vinay.sajip | 2009-05-09 07:07:17 -0500 (Sat, 09 May 2009) | 1 line Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when trying to print a traceback. ........ r72525 | benjamin.peterson | 2009-05-09 20:38:02 -0500 (Sat, 09 May 2009) | 1 line close file explicitly ........ r72526 | benjamin.peterson | 2009-05-09 21:29:00 -0500 (Sat, 09 May 2009) | 1 line make sure files are closed using the with statement ........ r72551 | benjamin.peterson | 2009-05-10 09:16:47 -0500 (Sun, 10 May 2009) | 1 line use isinstance ........ r72558 | benjamin.peterson | 2009-05-10 18:52:09 -0500 (Sun, 10 May 2009) | 1 line sys.setdefaultencoding() strikes me as a bad example ........ r72616 | benjamin.peterson | 2009-05-13 19:33:10 -0500 (Wed, 13 May 2009) | 1 line importlib.import_module is better these days ........ r72654 | benjamin.peterson | 2009-05-14 17:37:49 -0500 (Thu, 14 May 2009) | 1 line prevent refleaks from threads ........ r72655 | benjamin.peterson | 2009-05-14 17:40:34 -0500 (Thu, 14 May 2009) | 1 line a useful decorator for cleaning up threads ........ r72689 | benjamin.peterson | 2009-05-16 13:44:34 -0500 (Sat, 16 May 2009) | 1 line use skipTest() ........ r72745 | benjamin.peterson | 2009-05-17 09:16:29 -0500 (Sun, 17 May 2009) | 1 line ignore .rst files in sphinx its self ........ r72750 | benjamin.peterson | 2009-05-17 11:59:27 -0500 (Sun, 17 May 2009) | 1 line chop off slash ........ r72802 | georg.brandl | 2009-05-20 13:35:27 -0500 (Wed, 20 May 2009) | 1 line #6051: refer to email examples for better way to construct email messages. ........ r72812 | michael.foord | 2009-05-21 17:57:02 -0500 (Thu, 21 May 2009) | 1 line Rename TestCase._result to _resultForDoCleanups to avoid potential clashes in TestCase subclasses. Issue 6072. ........ r72822 | georg.brandl | 2009-05-22 04:33:25 -0500 (Fri, 22 May 2009) | 1 line #6084: fix example. ........ r72824 | georg.brandl | 2009-05-22 04:43:17 -0500 (Fri, 22 May 2009) | 1 line Fix references to file-related functions and methods (os.* vs file.*). ........ r72826 | georg.brandl | 2009-05-22 04:49:42 -0500 (Fri, 22 May 2009) | 1 line Fix confusing wording. ........ r72827 | georg.brandl | 2009-05-22 04:50:30 -0500 (Fri, 22 May 2009) | 1 line s/use/call/ ........ r72833 | georg.brandl | 2009-05-22 12:00:17 -0500 (Fri, 22 May 2009) | 1 line #6078: _warnings is a builtin module and has no standard init_warnings function. ........ r72876 | benjamin.peterson | 2009-05-23 15:59:09 -0500 (Sat, 23 May 2009) | 1 line remove mention of old ctypes version ........ r72890 | gregory.p.smith | 2009-05-24 13:00:13 -0500 (Sun, 24 May 2009) | 2 lines add a versionadded tag for set_tunnel ........ r72923 | michael.foord | 2009-05-25 15:36:56 -0500 (Mon, 25 May 2009) | 1 line Make assertSequenceEqual error messages less cryptic, particularly for nested sequences. ........ r72946 | ronald.oussoren | 2009-05-26 13:44:48 -0500 (Tue, 26 May 2009) | 2 lines Fixes issue 6110 ........ r73026 | r.david.murray | 2009-05-29 14:30:27 -0500 (Fri, 29 May 2009) | 3 lines Issue 6141: document that the first item of args is still the command name even when executable is specified. ........ r73042 | benjamin.peterson | 2009-05-29 22:10:52 -0500 (Fri, 29 May 2009) | 1 line no fdatasync on macos ........ r73045 | georg.brandl | 2009-05-30 02:26:04 -0500 (Sat, 30 May 2009) | 1 line #6146: fix markup bug. ........ r73047 | georg.brandl | 2009-05-30 05:33:23 -0500 (Sat, 30 May 2009) | 1 line Fix some more small markup problems. ........ r73065 | antoine.pitrou | 2009-05-30 16:39:25 -0500 (Sat, 30 May 2009) | 3 lines The test for #5330 wasn't correct. ........ r73068 | antoine.pitrou | 2009-05-30 16:45:40 -0500 (Sat, 30 May 2009) | 3 lines Update ACKS ........ r73069 | benjamin.peterson | 2009-05-30 19:42:42 -0500 (Sat, 30 May 2009) | 1 line fix signature ........
This commit is contained in:
Benjamin Peterson
parent
f11be75760
commit
fa0d703433
23 changed files with 132 additions and 101 deletions
|
|
@ -353,7 +353,7 @@ class TestCase(object):
|
|||
not have a method with the specified name.
|
||||
"""
|
||||
self._testMethodName = methodName
|
||||
self._result = None
|
||||
self._resultForDoCleanups = None
|
||||
try:
|
||||
testMethod = getattr(self, methodName)
|
||||
except AttributeError:
|
||||
|
|
@ -457,7 +457,7 @@ class TestCase(object):
|
|||
if startTestRun is not None:
|
||||
startTestRun()
|
||||
|
||||
self._result = result
|
||||
self._resultForDoCleanups = result
|
||||
result.startTest(self)
|
||||
if getattr(self.__class__, "__unittest_skip__", False):
|
||||
# If the whole class was skipped.
|
||||
|
|
@ -511,7 +511,7 @@ class TestCase(object):
|
|||
def doCleanups(self):
|
||||
"""Execute all cleanup functions. Normally called for you after
|
||||
tearDown."""
|
||||
result = self._result
|
||||
result = self._resultForDoCleanups
|
||||
ok = True
|
||||
while self._cleanups:
|
||||
function, args, kwargs = self._cleanups.pop(-1)
|
||||
|
|
@ -732,23 +732,32 @@ class TestCase(object):
|
|||
if seq1 == seq2:
|
||||
return
|
||||
|
||||
seq1_repr = repr(seq1)
|
||||
seq2_repr = repr(seq2)
|
||||
if len(seq1_repr) > 30:
|
||||
seq1_repr = seq1_repr[:30] + '...'
|
||||
if len(seq2_repr) > 30:
|
||||
seq2_repr = seq2_repr[:30] + '...'
|
||||
elements = (seq_type_name.capitalize(), seq1_repr, seq2_repr)
|
||||
differing = '%ss differ: %s != %s\n' % elements
|
||||
|
||||
for i in range(min(len1, len2)):
|
||||
try:
|
||||
item1 = seq1[i]
|
||||
except (TypeError, IndexError, NotImplementedError):
|
||||
differing = ('Unable to index element %d of first %s\n' %
|
||||
differing += ('\nUnable to index element %d of first %s\n' %
|
||||
(i, seq_type_name))
|
||||
break
|
||||
|
||||
try:
|
||||
item2 = seq2[i]
|
||||
except (TypeError, IndexError, NotImplementedError):
|
||||
differing = ('Unable to index element %d of second %s\n' %
|
||||
differing += ('\nUnable to index element %d of second %s\n' %
|
||||
(i, seq_type_name))
|
||||
break
|
||||
|
||||
if item1 != item2:
|
||||
differing = ('First differing element %d:\n%s\n%s\n' %
|
||||
differing += ('\nFirst differing element %d:\n%s\n%s\n' %
|
||||
(i, item1, item2))
|
||||
break
|
||||
else:
|
||||
|
|
@ -756,28 +765,26 @@ class TestCase(object):
|
|||
type(seq1) != type(seq2)):
|
||||
# The sequences are the same, but have differing types.
|
||||
return
|
||||
# A catch-all message for handling arbitrary user-defined
|
||||
# sequences.
|
||||
differing = '%ss differ:\n' % seq_type_name.capitalize()
|
||||
if len1 > len2:
|
||||
differing = ('First %s contains %d additional '
|
||||
'elements.\n' % (seq_type_name, len1 - len2))
|
||||
try:
|
||||
differing += ('First extra element %d:\n%s\n' %
|
||||
(len2, seq1[len2]))
|
||||
except (TypeError, IndexError, NotImplementedError):
|
||||
differing += ('Unable to index element %d '
|
||||
'of first %s\n' % (len2, seq_type_name))
|
||||
elif len1 < len2:
|
||||
differing = ('Second %s contains %d additional '
|
||||
'elements.\n' % (seq_type_name, len2 - len1))
|
||||
try:
|
||||
differing += ('First extra element %d:\n%s\n' %
|
||||
(len1, seq2[len1]))
|
||||
except (TypeError, IndexError, NotImplementedError):
|
||||
differing += ('Unable to index element %d '
|
||||
'of second %s\n' % (len1, seq_type_name))
|
||||
standardMsg = differing + '\n'.join(difflib.ndiff(pprint.pformat(seq1).splitlines(),
|
||||
|
||||
if len1 > len2:
|
||||
differing += ('\nFirst %s contains %d additional '
|
||||
'elements.\n' % (seq_type_name, len1 - len2))
|
||||
try:
|
||||
differing += ('First extra element %d:\n%s\n' %
|
||||
(len2, seq1[len2]))
|
||||
except (TypeError, IndexError, NotImplementedError):
|
||||
differing += ('Unable to index element %d '
|
||||
'of first %s\n' % (len2, seq_type_name))
|
||||
elif len1 < len2:
|
||||
differing += ('\nSecond %s contains %d additional '
|
||||
'elements.\n' % (seq_type_name, len2 - len1))
|
||||
try:
|
||||
differing += ('First extra element %d:\n%s\n' %
|
||||
(len1, seq2[len1]))
|
||||
except (TypeError, IndexError, NotImplementedError):
|
||||
differing += ('Unable to index element %d '
|
||||
'of second %s\n' % (len1, seq_type_name))
|
||||
standardMsg = differing + '\n' + '\n'.join(difflib.ndiff(pprint.pformat(seq1).splitlines(),
|
||||
pprint.pformat(seq2).splitlines()))
|
||||
msg = self._formatMessage(msg, standardMsg)
|
||||
self.fail(msg)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue