This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11051

run-tests: use more explicit signaling for `chg`
ClosedPublic

Authored by marmoute on Jul 9 2021, 8:35 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa8e33ab50c4f: run-tests: use more explicit signaling for `chg`
rHG63e7423d3937: run-tests: use more explicit signaling for `chg`
Summary

Using a dedicated variable is clearer and less fragile. It cannot hurt.

Diff Detail

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

Event Timeline

marmoute created this revision.Jul 9 2021, 8:35 PM
baymax updated this revision to Diff 29086.Jul 9 2021, 9:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29106.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute updated this revision to Diff 29138.Jul 10 2021, 1:47 PM
Alphare accepted this revision.Jul 13 2021, 12:00 PM
This revision is now accepted and ready to land.Jul 13 2021, 12:00 PM
marmoute added a commit: rHG63e7423d3937: run-tests: use more explicit signaling for `chg`.Jul 13 2021, 12:26 PM
Closed by commit rHG63e7423d3937: run-tests: use more explicit signaling for `chg` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29138

tests/hghave.py

except (AttributeError, ImportError): except (AttributeError, ImportError):
return False return False
# Test the executable # Test the executable
return matchoutput('brz --version 2>&1', br'Breezy \(brz\) ') return matchoutput('brz --version 2>&1', br'Breezy \(brz\) ')
@check("chg", "running with chg") @check("chg", "running with chg")
def has_chg(): def has_chg():
return 'CHGHG' in os.environ return 'CHG_INSTALLED_AS_HG' in os.environ
@check("rhg", "running with rhg as 'hg'") @check("rhg", "running with rhg as 'hg'")
def has_rhg(): def has_rhg():
return 'RHG_INSTALLED_AS_HG' in os.environ return 'RHG_INSTALLED_AS_HG' in os.environ
@check("cvs", "cvs client/server") @check("cvs", "cvs client/server")

tests/run-tests.py

self._hgcommand += b'.exe' self._hgcommand += b'.exe'
real_hg = os.path.join(self._bindir, self._hgcommand) real_hg = os.path.join(self._bindir, self._hgcommand)
assert real_hg is not None assert real_hg is not None
osenvironb[b'HGTEST_REAL_HG'] = real_hg osenvironb[b'HGTEST_REAL_HG'] = real_hg
# set CHGHG, then replace "hg" command by "chg" # set CHGHG, then replace "hg" command by "chg"
chgbindir = self._bindir chgbindir = self._bindir
if self.options.chg or self.options.with_chg: if self.options.chg or self.options.with_chg:
osenvironb[b'CHG_INSTALLED_AS_HG'] = b'1'
osenvironb[b'CHGHG'] = real_hg osenvironb[b'CHGHG'] = real_hg
else: else:
osenvironb.pop(b'CHGHG', None) # drop flag for hghave # drop flag for hghave
osenvironb.pop(b'CHG_INSTALLED_AS_HG', None)
if self.options.chg: if self.options.chg:
self._hgcommand = b'chg' self._hgcommand = b'chg'
elif self.options.with_chg: elif self.options.with_chg:
chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg)) chgbindir = os.path.dirname(os.path.realpath(self.options.with_chg))
self._hgcommand = os.path.basename(self.options.with_chg) self._hgcommand = os.path.basename(self.options.with_chg)
# configure fallback and replace "hg" command by "rhg" # configure fallback and replace "hg" command by "rhg"
rhgbindir = self._bindir rhgbindir = self._bindir