D3833: py3: make tests/test-diff-antipatience.t work with python 3
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Tue Jun 26 08:10:30 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9ef9884e5d50: py3: make tests/test-diff-antipatience.t work with python 3 (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3833?vs=9293&id=9302
REVISION DETAIL
https://phab.mercurial-scm.org/D3833
AFFECTED FILES
contrib/python3-whitelist
tests/test-diff-antipatience.t
CHANGE DETAILS
diff --git a/tests/test-diff-antipatience.t b/tests/test-diff-antipatience.t
--- a/tests/test-diff-antipatience.t
+++ b/tests/test-diff-antipatience.t
@@ -11,9 +11,9 @@
Test case that makes use of the weakness of patience diff algorithm
$ hg init
- >>> open('a', 'wb').write(b'\n'.join(list(b'a' + b'x' * 10 + b'u' + b'x' * 30 + b'a\n')))
+ >>> open('a', 'wb').write(('\n'.join(list('a' + 'x' * 10 + 'u' + 'x' * 30 + 'a\n'))).encode('ascii')) and None
$ hg commit -m 1 -A a
- >>> open('a', 'wb').write(b'\n'.join(list(b'b' + b'x' * 30 + b'u' + b'x' * 10 + b'b\n')))
+ >>> open('a', 'wb').write(('\n'.join(list('b' + 'x' * 30 + 'u' + 'x' * 10 + 'b\n'))).encode('ascii')) and None
#if xdiff
$ hg diff
diff -r f0aeecb49805 a
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -88,6 +88,7 @@
test-debugindexdot.t
test-debugrename.t
test-default-push.t
+test-diff-antipatience.t
test-diff-binary-file.t
test-diff-change.t
test-diff-copy-depth.t
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list