This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8334

tests: pass str to matchoutput()
ClosedPublic

Authored by indygreg on Mar 28 2020, 9:40 PM.

Details

Reviewers
mharbison72
pulkit
Group Reviewers
hg-reviewers
Commits
rHG51ffb2a6c08a: tests: pass str to matchoutput()
Summary

It accepts a str, not bytes.

This fixes a failure in test-hghave.t on Windows. Why it
wasn't failing on Linux, I don't know. I suspect the Windows
process code in Python doesn't accept bytes and the POSIX code
does?

Diff Detail

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

Event Timeline

indygreg created this revision.Mar 28 2020, 9:40 PM
mharbison72 accepted this revision.Mar 30 2020, 2:37 PM
mharbison72 added a subscriber: mharbison72.

I suspect the Windows process code in Python doesn't accept bytes and the POSIX code does?

That's definitely my experience, and the reason for procutil.tonativestr().

pulkit accepted this revision.Mar 31 2020, 6:16 AM
This revision is now accepted and ready to land.Mar 31 2020, 6:16 AM
indygreg added a commit: rHG51ffb2a6c08a: tests: pass str to matchoutput().Apr 1 2020, 11:22 AM
Closed by commit rHG51ffb2a6c08a: tests: pass str to matchoutput() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (2 lines)

Diff 20900

tests/hghave.py

def has_hg_range(v): def has_hg_range(v):
major, minor = v.split('.')[0:2] major, minor = v.split('.')[0:2]
return gethgversion() >= (int(major), int(minor)) return gethgversion() >= (int(major), int(minor))
@check("rust", "Using the Rust extensions") @check("rust", "Using the Rust extensions")
def has_rust(): def has_rust():
"""Check is the mercurial currently running is using some rust code""" """Check is the mercurial currently running is using some rust code"""
cmd = b'hg debuginstall --quiet 2>&1' cmd = 'hg debuginstall --quiet 2>&1'
match = br'checking module policy \(([^)]+)\)' match = br'checking module policy \(([^)]+)\)'
policy = matchoutput(cmd, match) policy = matchoutput(cmd, match)
if not policy: if not policy:
return False return False
return b'rust' in policy.group(1) return b'rust' in policy.group(1)
@check("hg08", "Mercurial >= 0.8") @check("hg08", "Mercurial >= 0.8")