( )⚙ D10096 tests: Add `rhg` and `no-rhg` for #require and #if in .t files

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10096

tests: Add `rhg` and `no-rhg` for #require and #if in .t files
ClosedPublic

Authored by SimonSapin on Mar 3 2021, 12:09 PM.

Details

Reviewers
Alphare
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG78e6700ab009: tests: Add `rhg` and `no-rhg` for #require and #if in .t files
Summary

With this we can allow some small differences in expected output
between Rust-based and Python-based code paths.

Diff Detail

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

Event Timeline

SimonSapin created this revision.Mar 3 2021, 12:09 PM
SimonSapin updated this revision to Diff 26033.Mar 3 2021, 1:24 PM
SimonSapin updated this revision to Diff 26051.Mar 4 2021, 6:10 AM
baymax updated this revision to Diff 26070.Mar 4 2021, 8:00 AM

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

Alphare accepted this revision.Mar 5 2021, 3:46 AM
marmoute accepted this revision.Mar 9 2021, 1:00 PM
pulkit accepted this revision.Mar 10 2021, 1:33 PM
This revision is now accepted and ready to land.Mar 10 2021, 1:33 PM

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (5 lines)
Mtests/run-tests.py (1 line)
Mtests/test-rhg.t (17 lines)

Diff 26031

tests/hghave.py

return False return False
@check("chg", "running with chg") @check("chg", "running with chg")
def has_chg(): def has_chg():
return 'CHGHG' in os.environ return 'CHGHG' in os.environ
@check("rhg", "running with rhg as 'hg'")
def has_rhg():
return 'RHG_INSTALLED_AS_HG' in os.environ
@check("cvs", "cvs client/server") @check("cvs", "cvs client/server")
def has_cvs(): def has_cvs():
re = br'Concurrent Versions System.*?server' re = br'Concurrent Versions System.*?server'
return matchoutput('cvs --version 2>&1', re) and not has_msys() return matchoutput('cvs --version 2>&1', re) and not has_msys()
@check("cvs112", "cvs client/server 1.12.* (not cvsnt)") @check("cvs112", "cvs client/server 1.12.* (not cvsnt)")
def has_cvs112(): def has_cvs112():

tests/run-tests.py

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)
# set fallback executable path, then replace "hg" command by "rhg" # set fallback executable path, then replace "hg" command by "rhg"
rhgbindir = self._bindir rhgbindir = self._bindir
if self.options.rhg or self.options.with_rhg: if self.options.rhg or self.options.with_rhg:
self._rhg_fallback_exe = os.path.join(self._bindir, self._hgcommand) self._rhg_fallback_exe = os.path.join(self._bindir, self._hgcommand)
osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1' # For hghave.py
if self.options.rhg: if self.options.rhg:
self._hgcommand = b'rhg' self._hgcommand = b'rhg'
elif self.options.with_rhg: elif self.options.with_rhg:
rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg)) rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
self._hgcommand = os.path.basename(self.options.with_rhg) self._hgcommand = os.path.basename(self.options.with_rhg)
osenvironb[b"BINDIR"] = self._bindir osenvironb[b"BINDIR"] = self._bindir
osenvironb[b"PYTHON"] = PYTHON osenvironb[b"PYTHON"] = PYTHON

tests/test-rhg.t

#require rust #require rhg
Define an rhg function that will only run if rhg exists
$ RHG="$RUNTESTDIR/../rust/target/release/rhg"
$ rhg() {
> if [ -f "$RHG" ]; then
> "$RHG" "$@"
> else
> echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg."
> exit 80
> fi
> }
Unimplemented command Unimplemented command
$ rhg unimplemented-command --config rhg.on-unsupported=abort $ rhg unimplemented-command --config rhg.on-unsupported=abort
unsupported feature: error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context unsupported feature: error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context
USAGE: USAGE:
rhg [OPTIONS] <SUBCOMMAND> rhg [OPTIONS] <SUBCOMMAND>
$ rhg cat original --config rhg.fallback-executable=false $ rhg cat original --config rhg.fallback-executable=false
[1] [1]
$ rhg cat original --config rhg.fallback-executable=hg-non-existent $ rhg cat original --config rhg.fallback-executable=hg-non-existent
tried to fall back to a 'hg-non-existent' sub-process but got error $ENOENT$ tried to fall back to a 'hg-non-existent' sub-process but got error $ENOENT$
unsupported feature: `rhg cat` without `--rev` / `-r` unsupported feature: `rhg cat` without `--rev` / `-r`
[252] [252]
$ rhg cat original --config rhg.fallback-executable="$RHG" $ rhg cat original --config rhg.fallback-executable=rhg
Blocking recursive fallback. The 'rhg.fallback-executable = */rust/target/release/rhg' config points to `rhg` itself. (glob) Blocking recursive fallback. The 'rhg.fallback-executable = rhg' config points to `rhg` itself.
unsupported feature: `rhg cat` without `--rev` / `-r` unsupported feature: `rhg cat` without `--rev` / `-r`
[252] [252]
Requirements Requirements
$ rhg debugrequirements $ rhg debugrequirements
dotencode dotencode
fncache fncache
generaldelta generaldelta