This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5093

py3: fix test-revlog.t
ClosedPublic

Authored by mbthomas on Oct 14 2018, 5:08 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG29b0e9cd02f4: py3: fix test-revlog.t
Summary

The mpatchError has a trailing comma on Python 2 but not on Python 3, so use a glob to handle both Python 2 and 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

mbthomas created this revision.Oct 14 2018, 5:08 AM
mbthomas edited the summary of this revision. (Show Details)Oct 14 2018, 5:09 AM
Closed by commit rHG29b0e9cd02f4: py3: fix test-revlog.t (authored by mbthomas). · Explain WhyOct 14 2018, 5:28 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-revlog.t (9 lines)

Diff 12110

contrib/python3-whitelist

test-revert.t test-revert.t
test-revisions.t test-revisions.t
test-revlog-ancestry.py test-revlog-ancestry.py
test-revlog-group-emptyiter.t test-revlog-group-emptyiter.t
test-revlog-mmapindex.t test-revlog-mmapindex.t
test-revlog-packentry.t test-revlog-packentry.t
test-revlog-raw.py test-revlog-raw.py
test-revlog-v2.t test-revlog-v2.t
test-revlog.t
test-revset-dirstate-parents.t test-revset-dirstate-parents.t
test-revset-legacy-lookup.t test-revset-legacy-lookup.t
test-revset-outgoing.t test-revset-outgoing.t
test-rollback.t test-rollback.t
test-run-tests.py test-run-tests.py
test-run-tests.t test-run-tests.t
test-schemes.t test-schemes.t
test-serve.t test-serve.t

tests/test-revlog.t

[255] [255]
$ cd .. $ cd ..
Test for CVE-2016-3630 Test for CVE-2016-3630
$ hg init $ hg init
>>> open("a.i", "wb").write( >>> import codecs
>>> open("a.i", "wb").write(codecs.decode(codecs.decode(
... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD ... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD
... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA==""" ... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA==""",
... .decode("base64").decode("zlib")) and None ... "base64"), "zlib")) and None
$ hg debugrevlogindex a.i $ hg debugrevlogindex a.i
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 99e0332bd498 000000000000 000000000000 0 2 99e0332bd498 000000000000 000000000000
1 3 6674f57a23d8 99e0332bd498 000000000000 1 3 6674f57a23d8 99e0332bd498 000000000000
>>> from mercurial import revlog, vfs >>> from mercurial import revlog, vfs
>>> tvfs = vfs.vfs(b'.') >>> tvfs = vfs.vfs(b'.')
>>> tvfs.options = {b'revlogv1': True} >>> tvfs.options = {b'revlogv1': True}
>>> rl = revlog.revlog(tvfs, b'a.i') >>> rl = revlog.revlog(tvfs, b'a.i')
>>> rl.revision(1) >>> rl.revision(1)
mpatchError('patch cannot be decoded',) mpatchError(*'patch cannot be decoded'*) (glob)