( )⚙ D4695 py3: add b'' prefixes in tests/test-bdiff.py

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4695

py3: add b'' prefixes in tests/test-bdiff.py
ClosedPublic

Authored by pulkit on Sep 23 2018, 9:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe05d7c71f209: py3: add b'' prefixes in tests/test-bdiff.py
Summary

This makes the test close to passing

  1. skip-blame because just b'' prefixes

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Sep 23 2018, 9:09 PM
Closed by commit rHGe05d7c71f209: py3: add b'' prefixes in tests/test-bdiff.py (authored by pulkit). · Explain WhySep 24 2018, 1:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-bdiff.py (128 lines)

Diff 11297

tests/test-bdiff.py

"%r: \nbdiff: %r\npatched: %r" % (a, b, d, c[:200]))) "%r: \nbdiff: %r\npatched: %r" % (a, b, d, c[:200])))
def assert_bdiff(self, a, b): def assert_bdiff(self, a, b):
self.assert_bdiff_applies(a, b) self.assert_bdiff_applies(a, b)
self.assert_bdiff_applies(b, a) self.assert_bdiff_applies(b, a)
def test_bdiff_basic(self): def test_bdiff_basic(self):
cases = [ cases = [
("a\nc\n\n\n\n", "a\nb\n\n\n"), (b"a\nc\n\n\n\n", b"a\nb\n\n\n"),
("a\nb\nc\n", "a\nc\n"), (b"a\nb\nc\n", b"a\nc\n"),
("", ""), (b"", b""),
("a\nb\nc", "a\nb\nc"), (b"a\nb\nc", b"a\nb\nc"),
("a\nb\nc\nd\n", "a\nd\n"), (b"a\nb\nc\nd\n", b"a\nd\n"),
("a\nb\nc\nd\n", "a\nc\ne\n"), (b"a\nb\nc\nd\n", b"a\nc\ne\n"),
("a\nb\nc\n", "a\nc\n"), (b"a\nb\nc\n", b"a\nc\n"),
("a\n", "c\na\nb\n"), (b"a\n", b"c\na\nb\n"),
("a\n", ""), (b"a\n", b""),
("a\n", "b\nc\n"), (b"a\n", b"b\nc\n"),
("a\n", "c\na\n"), (b"a\n", b"c\na\n"),
("", "adjfkjdjksdhfksj"), (b"", b"adjfkjdjksdhfksj"),
("", "ab"), (b"", b"ab"),
("", "abc"), (b"", b"abc"),
("a", "a"), (b"a", b"a"),
("ab", "ab"), (b"ab", b"ab"),
("abc", "abc"), (b"abc", b"abc"),
("a\n", "a\n"), (b"a\n", b"a\n"),
("a\nb", "a\nb"), (b"a\nb", b"a\nb"),
] ]
for a, b in cases: for a, b in cases:
self.assert_bdiff(a, b) self.assert_bdiff(a, b)
def showdiff(self, a, b): def showdiff(self, a, b):
bin = mdiff.textdiff(a, b) bin = mdiff.textdiff(a, b)
pos = 0 pos = 0
q = 0 q = 0
actions = [] actions = []
while pos < len(bin): while pos < len(bin):
p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
pos += 12 pos += 12
if p1: if p1:
actions.append(a[q:p1]) actions.append(a[q:p1])
actions.append(diffreplace(p1, p2, a[p1:p2], bin[pos:pos + l])) actions.append(diffreplace(p1, p2, a[p1:p2], bin[pos:pos + l]))
pos += l pos += l
q = p2 q = p2
if q < len(a): if q < len(a):
actions.append(a[q:]) actions.append(a[q:])
return actions return actions
def test_issue1295(self): def test_issue1295(self):
cases = [ cases = [
("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n", (b"x\n\nx\n\nx\n\nx\n\nz\n", b"x\n\nx\n\ny\n\nx\n\nx\n\nz\n",
['x\n\nx\n\n', diffreplace(6, 6, '', 'y\n\n'), 'x\n\nx\n\nz\n']), [b'x\n\nx\n\n',
("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n", diffreplace(6, 6, b'', b'y\n\n'),
['x\n\nx\n\n', b'x\n\nx\n\nz\n']),
diffreplace(6, 6, '', 'y\n\n'), (b"x\n\nx\n\nx\n\nx\n\nz\n", b"x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n",
'x\n\n', [b'x\n\nx\n\n',
diffreplace(9, 9, '', 'y\n\n'), diffreplace(6, 6, b'', b'y\n\n'),
'x\n\nz\n']), b'x\n\n',
diffreplace(9, 9, b'', b'y\n\n'),
b'x\n\nz\n']),
] ]
for old, new, want in cases: for old, new, want in cases:
self.assertEqual(self.showdiff(old, new), want) self.assertEqual(self.showdiff(old, new), want)
def test_issue1295_varies_on_pure(self): def test_issue1295_varies_on_pure(self):
# we should pick up abbbc. rather than bc.de as the longest match # we should pick up abbbc. rather than bc.de as the longest match
got = self.showdiff("a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n", got = self.showdiff(b"a\nb\nb\nb\nc\n.\nd\ne\n.\nf\n",
"a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n") b"a\nb\nb\na\nb\nb\nb\nc\n.\nb\nc\n.\nd\ne\nf\n")
want_c = ['a\nb\nb\n', want_c = [b'a\nb\nb\n',
diffreplace(6, 6, '', 'a\nb\nb\nb\nc\n.\n'), diffreplace(6, 6, b'', b'a\nb\nb\nb\nc\n.\n'),
'b\nc\n.\nd\ne\n', b'b\nc\n.\nd\ne\n',
diffreplace(16, 18, '.\n', ''), diffreplace(16, 18, b'.\n', b''),
'f\n'] b'f\n']
want_pure = [diffreplace(0, 0, '', 'a\nb\nb\n'), want_pure = [diffreplace(0, 0, b'', b'a\nb\nb\n'),
'a\nb\nb\nb\nc\n.\n', b'a\nb\nb\nb\nc\n.\n',
diffreplace(12, 12, '', 'b\nc\n.\n'), diffreplace(12, 12, b'', b'b\nc\n.\n'),
'd\ne\n', b'd\ne\n',
diffreplace(16, 18, '.\n', ''), 'f\n'] diffreplace(16, 18, b'.\n', b''), b'f\n']
self.assert_(got in (want_c, want_pure), self.assert_(got in (want_c, want_pure),
'got: %r, wanted either %r or %r' % ( 'got: %r, wanted either %r or %r' % (
got, want_c, want_pure)) got, want_c, want_pure))
def test_fixws(self): def test_fixws(self):
cases = [ cases = [
(" \ta\r b\t\n", "ab\n", 1), (b" \ta\r b\t\n", b"ab\n", 1),
(" \ta\r b\t\n", " a b\n", 0), (b" \ta\r b\t\n", b" a b\n", 0),
("", "", 1), (b"", b"", 1),
("", "", 0), (b"", b"", 0),
] ]
for a, b, allws in cases: for a, b, allws in cases:
c = mdiff.fixws(a, allws) c = mdiff.fixws(a, allws)
self.assertEqual( self.assertEqual(
c, b, 'fixws(%r) want %r got %r (allws=%r)' % (a, b, c, allws)) c, b, 'fixws(%r) want %r got %r (allws=%r)' % (a, b, c, allws))
def test_nice_diff_for_trivial_change(self): def test_nice_diff_for_trivial_change(self):
self.assertEqual(self.showdiff( self.assertEqual(self.showdiff(
''.join('<%s\n-\n' % i for i in range(5)), b''.join(b'<%s\n-\n' % i for i in range(5)),
''.join('>%s\n-\n' % i for i in range(5))), b''.join(b'>%s\n-\n' % i for i in range(5))),
[diffreplace(0, 3, '<0\n', '>0\n'), [diffreplace(0, 3, b'<0\n', b'>0\n'),
'-\n', b'-\n',
diffreplace(5, 8, '<1\n', '>1\n'), diffreplace(5, 8, b'<1\n', b'>1\n'),
'-\n', b'-\n',
diffreplace(10, 13, '<2\n', '>2\n'), diffreplace(10, 13, b'<2\n', b'>2\n'),
'-\n', b'-\n',
diffreplace(15, 18, '<3\n', '>3\n'), diffreplace(15, 18, b'<3\n', b'>3\n'),
'-\n', b'-\n',
diffreplace(20, 23, '<4\n', '>4\n'), diffreplace(20, 23, b'<4\n', b'>4\n'),
'-\n']) b'-\n'])
def test_prefer_appending(self): def test_prefer_appending(self):
# 1 line to 3 lines # 1 line to 3 lines
self.assertEqual(self.showdiff('a\n', 'a\n' * 3), self.assertEqual(self.showdiff(b'a\n', b'a\n' * 3),
['a\n', diffreplace(2, 2, '', 'a\na\n')]) [b'a\n', diffreplace(2, 2, b'', b'a\na\n')])
# 1 line to 5 lines # 1 line to 5 lines
self.assertEqual(self.showdiff('a\n', 'a\n' * 5), self.assertEqual(self.showdiff(b'a\n', b'a\n' * 5),
['a\n', diffreplace(2, 2, '', 'a\na\na\na\n')]) [b'a\n', diffreplace(2, 2, b'', b'a\na\na\na\n')])
def test_prefer_removing_trailing(self): def test_prefer_removing_trailing(self):
# 3 lines to 1 line # 3 lines to 1 line
self.assertEqual(self.showdiff('a\n' * 3, 'a\n'), self.assertEqual(self.showdiff(b'a\n' * 3, b'a\n'),
['a\n', diffreplace(2, 6, 'a\na\n', '')]) [b'a\n', diffreplace(2, 6, b'a\na\n', b'')])
# 5 lines to 1 line # 5 lines to 1 line
self.assertEqual(self.showdiff('a\n' * 5, 'a\n'), self.assertEqual(self.showdiff(b'a\n' * 5, b'a\n'),
['a\n', diffreplace(2, 10, 'a\na\na\na\n', '')]) [b'a\n', diffreplace(2, 10, b'a\na\na\na\n', b'')])
if __name__ == '__main__': if __name__ == '__main__':
import silenttestrunner import silenttestrunner
silenttestrunner.main(__name__) silenttestrunner.main(__name__)