mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-16 14:50:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #10242: backport of more fixes to unittest.TestCase.assertItemsEqual

Browse source
This commit is contained in:
Michael Foord 2011-03-16 20:34:53 -04:00
parent 2ab5994dbe
commit 4c9e91a092
4 changed files with 105 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Lib/unittest/case.py
View file

@ -10,9 +10,11 @@ import warnings
from . import result
from .util import (
strclass, safe_repr, sorted_list_difference, unorderable_list_difference
strclass, safe_repr, unorderable_list_difference,
_count_diff_all_purpose, _count_diff_hashable
)
__unittest = True
@ -863,6 +865,7 @@ class TestCase(object):
- [0, 1, 1] and [1, 0, 1] compare equal.
- [0, 0, 1] and [0, 1] compare unequal.
"""
first_seq, second_seq = list(actual_seq), list(expected_seq)
with warnings.catch_warnings():
if sys.py3kwarning:
# Silence Py3k warning raised during the sorting
@ -871,29 +874,23 @@ class TestCase(object):
"comparing unequal types"]:
warnings.filterwarnings("ignore", _msg, DeprecationWarning)
try:
actual = collections.Counter(iter(actual_seq))
expected = collections.Counter(iter(expected_seq))
first = collections.Counter(first_seq)
second = collections.Counter(second_seq)
except TypeError:
# Unsortable items (example: set(), complex(), ...)
actual = list(actual_seq)
expected = list(expected_seq)
missing, unexpected = unorderable_list_difference(expected, actual)
# Handle case with unhashable elements
differences = _count_diff_all_purpose(first_seq, second_seq)
else:
if actual == expected:
if first == second:
return
missing = list(expected - actual)
unexpected = list(actual - expected)
differences = _count_diff_hashable(first_seq, second_seq)
errors = []
if missing:
errors.append('Expected, but missing:\n %s' %
safe_repr(missing))
if unexpected:
errors.append('Unexpected, but present:\n %s' %
safe_repr(unexpected))
if errors:
standardMsg = '\n'.join(errors)
self.fail(self._formatMessage(msg, standardMsg))
if differences:
standardMsg = 'Element counts were not equal:\n'
lines = ['First has %d, Second has %d: %r' % diff for diff in differences]
diffMsg = '\n'.join(lines)
standardMsg = self._truncateMessage(standardMsg, diffMsg)
msg = self._formatMessage(msg, standardMsg)
self.fail(msg)
def assertMultiLineEqual(self, first, second, msg=None):
"""Assert that two multi-line strings are equal."""