( )⚙ D4697 tests: use assertTrue() instead of assert_() in test-bdiff.py

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4697

tests: use assertTrue() instead of assert_() in test-bdiff.py
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe961f18a0094: tests: use assertTrue() instead of assert_() in test-bdiff.py
Summary

The later is deprecated in Python 3.

This patch also makes the test pass on Python 3.

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 rHGe961f18a0094: tests: use assertTrue() instead of assert_() in 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
Mcontrib/python3-whitelist (1 line)
Mtests/test-bdiff.py (6 lines)

Diff 11299

contrib/python3-whitelist

test-atomictempfile.py test-atomictempfile.py
test-audit-path.t test-audit-path.t
test-audit-subrepo.t test-audit-subrepo.t
test-automv.t test-automv.t
test-backout.t test-backout.t
test-backwards-remove.t test-backwards-remove.t
test-bad-pull.t test-bad-pull.t
test-basic.t test-basic.t
test-bdiff.py
test-bheads.t test-bheads.t
test-bisect.t test-bisect.t
test-bisect2.t test-bisect2.t
test-bisect3.t test-bisect3.t
test-blackbox.t test-blackbox.t
test-bookmarks-current.t test-bookmarks-current.t
test-bookmarks-merge.t test-bookmarks-merge.t
test-bookmarks-pushpull.t test-bookmarks-pushpull.t

tests/test-bdiff.py

b'b\nc\n.\nd\ne\n', b'b\nc\n.\nd\ne\n',
diffreplace(16, 18, b'.\n', b''), diffreplace(16, 18, b'.\n', b''),
b'f\n'] b'f\n']
want_pure = [diffreplace(0, 0, b'', b'a\nb\nb\n'), want_pure = [diffreplace(0, 0, b'', b'a\nb\nb\n'),
b'a\nb\nb\nb\nc\n.\n', b'a\nb\nb\nb\nc\n.\n',
diffreplace(12, 12, b'', b'b\nc\n.\n'), diffreplace(12, 12, b'', b'b\nc\n.\n'),
b'd\ne\n', b'd\ne\n',
diffreplace(16, 18, b'.\n', b''), b'f\n'] diffreplace(16, 18, b'.\n', b''), b'f\n']
self.assert_(got in (want_c, want_pure), self.assertTrue(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 = [
(b" \ta\r b\t\n", b"ab\n", 1), (b" \ta\r b\t\n", b"ab\n", 1),
(b" \ta\r b\t\n", b" a b\n", 0), (b" \ta\r b\t\n", b" a b\n", 0),
(b"", b"", 1), (b"", b"", 1),
(b"", b"", 0), (b"", b"", 0),
] ]