This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8674

run-tests: find python binary on Python 3 (issue6361)
ClosedPublic

Authored by pike on Jul 1 2020, 9:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG383005aa9cdc: run-tests: find python binary on Python 3 (issue6361)
Summary

Return strings from _findprogram as all callers expect
unicode strings.
Previously the check in _usecorrectpython agains sysexecutable
was always false on Python 3.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pike created this revision.Jul 1 2020, 9:48 AM
pike added a commit: rHG383005aa9cdc: run-tests: find python binary on Python 3 (issue6361).Jul 1 2020, 6:35 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG383005aa9cdc: run-tests: find python binary on Python 3 (issue6361) (authored by pike). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (4 lines)

Diff 21747

tests/run-tests.py

def _findprogram(self, program): def _findprogram(self, program):
"""Search PATH for a executable program""" """Search PATH for a executable program"""
dpb = _sys2bytes(os.defpath) dpb = _sys2bytes(os.defpath)
sepb = _sys2bytes(os.pathsep) sepb = _sys2bytes(os.pathsep)
for p in osenvironb.get(b'PATH', dpb).split(sepb): for p in osenvironb.get(b'PATH', dpb).split(sepb):
name = os.path.join(p, program) name = os.path.join(p, program)
if os.name == 'nt' or os.access(name, os.X_OK): if os.name == 'nt' or os.access(name, os.X_OK):
return name return _bytes2sys(name)
return None return None
def _checktools(self): def _checktools(self):
"""Ensure tools required to run tests are present.""" """Ensure tools required to run tests are present."""
for p in self.REQUIREDTOOLS: for p in self.REQUIREDTOOLS:
if os.name == 'nt' and not p.endswith(b'.exe'): if os.name == 'nt' and not p.endswith(b'.exe'):
p += b'.exe' p += b'.exe'
found = self._findprogram(p) found = self._findprogram(p)
p = p.decode("utf-8") p = p.decode("utf-8")
if found: if found:
vlog("# Found prerequisite", p, "at", _bytes2sys(found)) vlog("# Found prerequisite", p, "at", found)
else: else:
print("WARNING: Did not find prerequisite tool: %s " % p) print("WARNING: Did not find prerequisite tool: %s " % p)
def aggregateexceptions(path): def aggregateexceptions(path):
exceptioncounts = collections.Counter() exceptioncounts = collections.Counter()
testsbyfailure = collections.defaultdict(set) testsbyfailure = collections.defaultdict(set)
failuresbytest = collections.defaultdict(set) failuresbytest = collections.defaultdict(set)