Skip to content

Fix bpo-19217: Calling assertEquals for moderately long list takes too long #11204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eamanu wants to merge 3 commits into from
+15 −8
Closed

Fix bpo-19217: Calling assertEquals for moderately long list takes too long #11204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20fde31
Fix bpo-19217
eamanu Dec 17, 2018
6996d8a
fix unnecessary space and solve @gpshead comments
eamanu Dec 18, 2018
adfcf6d
fix test
Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Lib/difflib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,10 @@ def unified_diff(a, b, fromfile='', tofile='', fromfiledate='',
first, last = group[0], group[-1]
file1_range = _format_range_unified(first[1], last[2])
file2_range = _format_range_unified(first[3], last[4])
yield '@@ -{} +{} @@{}'.format(file1_range, file2_range, lineterm)
if isinstance(a, (list, tuple)) and isinstance(b, (list, tuple)):
yield lineterm
else:
yield '@@ -{} +{} @@{}'.format(file1_range, file2_range, lineterm)

for tag, i1, i2, j1, j2 in group:
if tag == 'equal':
Expand Down
8 changes: 5 additions & 3 deletions Lib/unittest/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,9 +1057,11 @@ def assertSequenceEqual(self, seq1, seq2, msg=None, seq_type=None):
differing += ('Unable to index element %d '
'of second %s\n' % (len1, seq_type_name))
standardMsg = differing
diffMsg = '\n' + '\n'.join(
difflib.ndiff(pprint.pformat(seq1).splitlines(),
pprint.pformat(seq2).splitlines()))
diffMsg = difflib.unified_diff(pprint.pformat(seq1).splitlines(),
pprint.pformat(seq2).splitlines(),
fromfile='expected', tofile='got',
lineterm='')
diffMsg = '\n' + '\n'.join(diffMsg)

standardMsg = self._truncateMessage(standardMsg, diffMsg)
msg = self._formatMessage(msg, standardMsg)
Expand Down
4 changes: 2 additions & 2 deletions Lib/unittest/test/test_assertions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ def testAssertSequenceEqual(self):
# Error messages are multiline so not testing on full message
# assertTupleEqual and assertListEqual delegate to this method
self.assertMessages('assertSequenceEqual', ([], [None]),
[r"\+ \[None\]$", "^oops$", r"\+ \[None\]$",
r"\+ \[None\] : oops$"])
[r"\+\[None\]$", "^oops$", r"\+\[None\]$",
r"\+\[None\] : oops$"])

def testAssertSetEqual(self):
self.assertMessages('assertSetEqual', (set(), set([None])),
Expand Down
6 changes: 4 additions & 2 deletions Lib/unittest/test/test_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,8 +789,10 @@ def testAssertSequenceEqualMaxDiff(self):
self.assertEqual(self.maxDiff, 80*8)
seq1 = 'a' + 'x' * 80**2
seq2 = 'b' + 'x' * 80**2
diff = '\n'.join(difflib.ndiff(pprint.pformat(seq1).splitlines(),
pprint.pformat(seq2).splitlines()))
diff = difflib.unified_diff(pprint.pformat(seq1).splitlines(),
pprint.pformat(seq2).splitlines(),
lineterm='')
diff = '\n'.join(diff)
# the +1 is the leading \n added by assertSequenceEqual
omitted = unittest.case.DIFF_OMITTED % (len(diff) + 1,)

Expand Down