This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3622

tests: fix test-parseindex2 on Python 3
ClosedPublic

Authored by durin42 on May 19 2018, 4:10 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3de58f50afa2: tests: fix test-parseindex2 on Python 3
Summary

parsers.versionerrortext is a sysstr, but it's only ever used in this
test on the Python side, so I'm okay to just handle it like this.

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

durin42 created this revision.May 19 2018, 4:10 PM
pulkit accepted this revision.May 19 2018, 4:17 PM
Closed by commit rHG3de58f50afa2: tests: fix test-parseindex2 on Python 3 (authored by durin42). · Explain WhyMay 19 2018, 4:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-parseindex2.py (3 lines)

Diff 8829

tests/test-parseindex2.py

import sys import sys
from mercurial.node import ( from mercurial.node import (
nullid, nullid,
nullrev, nullrev,
) )
from mercurial import ( from mercurial import (
policy, policy,
pycompat,
) )
parsers = policy.importmod(r'parsers') parsers = policy.importmod(r'parsers')
# original python implementation # original python implementation
def gettype(q): def gettype(q):
return int(q & 0xFFFF) return int(q & 0xFFFF)
def testversionokay(testnumber, hexversion): def testversionokay(testnumber, hexversion):
stdout, stderr = importparsers(hexversion) stdout, stderr = importparsers(hexversion)
if stdout: if stdout:
printhexfail(testnumber, hexversion, stdout, expected="no stdout") printhexfail(testnumber, hexversion, stdout, expected="no stdout")
def testversionfail(testnumber, hexversion): def testversionfail(testnumber, hexversion):
stdout, stderr = importparsers(hexversion) stdout, stderr = importparsers(hexversion)
# We include versionerrortext to distinguish from other ImportErrors. # We include versionerrortext to distinguish from other ImportErrors.
errtext = "ImportError: %s" % parsers.versionerrortext errtext = b"ImportError: %s" % pycompat.sysbytes(parsers.versionerrortext)
if errtext not in stdout: if errtext not in stdout:
printhexfail(testnumber, hexversion, stdout, printhexfail(testnumber, hexversion, stdout,
expected="stdout to contain %r" % errtext) expected="stdout to contain %r" % errtext)
def makehex(major, minor, micro): def makehex(major, minor, micro):
return int("%x%02x%02x00" % (major, minor, micro), 16) return int("%x%02x%02x00" % (major, minor, micro), 16)
def runversiontests(): def runversiontests():