( )⚙ D11053 run-tests: rely on an actual executable in PATH instead of alias for `hg`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11053

run-tests: rely on an actual executable in PATH instead of alias for `hg`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGeb611ecb435c: run-tests: rely on an actual executable in PATH instead of alias for `hg`
rHGd8226861a3d8: run-tests: rely on an actual executable in PATH instead of alias for `hg`
Summary

The alias approach is poorly inherited by other process that the test might
spawn.

To solve this we use the same approach as for python/python3 we write an
executable file explicitly. Doing this fixes which hg invocation that now
returns the same location as hg.

Using chg server side has some minor effect on some stdout/stderr ordering when
using chg as the server too.

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 29088.Jul 9 2021, 9:22 PM

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

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

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

marmoute retitled this revision from run-tests: rely on an actual file in PATH instead of alias for `hg` to run-tests: rely on an actual executable in PATH instead of alias for `hg`.Jul 10 2021, 1:47 PM
marmoute edited the summary of this revision. (Show Details)
marmoute updated this revision to Diff 29139.
Alphare accepted this revision.Jul 13 2021, 12:09 PM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
tests/test-bundle2-exchange.t
754

ew

This revision is now accepted and ready to land.Jul 13 2021, 12:09 PM

Revision Contents
Changeset List

Diff 29088

tests/run-tests.py

defaults = default_defaults.copy() defaults = default_defaults.copy()
def canonpath(path): def canonpath(path):
return os.path.realpath(os.path.expanduser(path)) return os.path.realpath(os.path.expanduser(path))
def which(exe):
if PYTHON3:
# shutil.which only accept bytes from 3.8
cmd = _bytes2sys(exe)
real_exec = shutil.which(cmd)
return _sys2bytes(real_exec)
else:
# let us do the os work
for p in osenvironb[b'PATH'].split(os.pathsep):
f = os.path.join(p, exe)
if os.path.isfile(f):
return f
return None
def parselistfiles(files, listtype, warn=True): def parselistfiles(files, listtype, warn=True):
entries = dict() entries = dict()
for filename in files: for filename in files:
try: try:
path = os.path.expanduser(os.path.expandvars(filename)) path = os.path.expanduser(os.path.expandvars(filename))
f = open(path, "rb") f = open(path, "rb")
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
skipping = None skipping = None
# We keep track of whether or not we're in a Python block so we # We keep track of whether or not we're in a Python block so we
# can generate the surrounding doctest magic. # can generate the surrounding doctest magic.
inpython = False inpython = False
if self._debug: if self._debug:
script.append(b'set -x\n') script.append(b'set -x\n')
if self._hgcommand != b'hg':
script.append(b'alias hg="%s"\n' % self._hgcommand)
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
script.append(b'alias pwd="pwd -W"\n') script.append(b'alias pwd="pwd -W"\n')
if hgcatapult and hgcatapult != os.devnull: if hgcatapult and hgcatapult != os.devnull:
if PYTHON3: if PYTHON3:
hgcatapult = hgcatapult.encode('utf8') hgcatapult = hgcatapult.encode('utf8')
cataname = self.name.encode('utf8') cataname = self.name.encode('utf8')
else: else:
self._installhg() self._installhg()
self._checkhglib("Testing") self._checkhglib("Testing")
if self.options.chg: if self.options.chg:
assert self._installdir assert self._installdir
self._installchg() self._installchg()
if self.options.rhg: if self.options.rhg:
assert self._installdir assert self._installdir
self._installrhg() self._installrhg()
self._use_correct_mercurial()
log( log(
'running %d tests using %d parallel processes' 'running %d tests using %d parallel processes'
% (num_tests, jobs) % (num_tests, jobs)
) )
result = runner.run(suite) result = runner.run(suite)
extra_paths.append(scripts_dir) extra_paths.append(scripts_dir)
os.environ['PATH'] = os.pathsep.join(extra_paths + path) os.environ['PATH'] = os.pathsep.join(extra_paths + path)
for pyexename in pyexe_names: for pyexename in pyexe_names:
if not self._findprogram(pyexename): if not self._findprogram(pyexename):
print("WARNING: Cannot find %s in search path" % pyexename) print("WARNING: Cannot find %s in search path" % pyexename)
def _use_correct_mercurial(self):
target_exec = os.path.join(self._custom_bin_dir, b'hg')
if self._hgcommand != b'hg':
# shutil.which only accept bytes from 3.8
real_exec = which(self._hgcommand)
if real_exec is None:
raise ValueError('could not find exec path for "%s"', real_exec)
if real_exec == target_exec:
# do not overwrite something with itself
return
if WINDOWS:
with open(target_exec, 'wb') as f:
f.write(b'#!/bin/sh\n')
escaped_exec = shellquote(_bytes2sys(real_exec))
f.write(b'%s "$@"\n' % _sys2bytes(escaped_exec))
else:
os.symlink(real_exec, target_exec)
self._createdfiles.append(target_exec)
def _installhg(self): def _installhg(self):
"""Install hg into the test environment. """Install hg into the test environment.
This will also configure hg with the appropriate testing settings. This will also configure hg with the appropriate testing settings.
""" """
vlog("# Performing temporary installation of HG") vlog("# Performing temporary installation of HG")
installerrs = os.path.join(self._hgtmp, b"install.err") installerrs = os.path.join(self._hgtmp, b"install.err")
compiler = '' compiler = ''

tests/test-bundle2-exchange.t

transaction abort! transaction abort!
Cleaning up the mess... Cleaning up the mess...
rollback completed rollback completed
abort: pretxnchangegroup hook exited with status 1 abort: pretxnchangegroup hook exited with status 1
[40] [40]
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
pushing to ssh://user@dummy/other pushing to ssh://user@dummy/other
searching for changes searching for changes
remote: Fail early! (no-py3 chg !)
AlphareUnsubmitted
Not Done

ew

Alphare: ew
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: Fail early! remote: Fail early! (py3 !)
remote: Fail early! (no-py3 no-chg !)
remote: transaction abort! remote: transaction abort!
remote: Cleaning up the mess... remote: Cleaning up the mess...
remote: rollback completed remote: rollback completed
remote: pretxnchangegroup hook exited with status 1 remote: pretxnchangegroup hook exited with status 1
abort: push failed on remote abort: push failed on remote
[100] [100]
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
pushing to http://localhost:$HGPORT2/ pushing to http://localhost:$HGPORT2/

tests/test-run-tests.t

$ rm test-serve-inuse.t $ rm test-serve-inuse.t
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
Running In Debug Mode Running In Debug Mode
====================== ======================
$ rt --debug 2>&1 | grep -v pwd $ rt --debug 2>&1 | grep -v pwd
running 2 tests using 1 parallel processes running 2 tests using 1 parallel processes
+ alias hg=hg.exe (windows !)
+ echo *SALT* 0 0 (glob) + echo *SALT* 0 0 (glob)
*SALT* 0 0 (glob) *SALT* 0 0 (glob)
+ echo babar + echo babar
babar babar
+ echo *SALT* 10 0 (glob) + echo *SALT* 10 0 (glob)
*SALT* 10 0 (glob) *SALT* 10 0 (glob)
.+ alias hg=hg.exe (windows !)
*+ echo *SALT* 0 0 (glob) *+ echo *SALT* 0 0 (glob)
*SALT* 0 0 (glob) *SALT* 0 0 (glob)
+ echo babar + echo babar
babar babar
+ echo *SALT* 2 0 (glob) + echo *SALT* 2 0 (glob)
*SALT* 2 0 (glob) *SALT* 2 0 (glob)
+ echo xyzzy + echo xyzzy
xyzzy xyzzy

tests/test-ssh-bundle1.t

$ hg push $ hg push
pushing to ssh://user@dummy/remote pushing to ssh://user@dummy/remote
searching for changes searching for changes
remote has heads on branch 'default' that are not known locally: 6c0482d977a3 remote has heads on branch 'default' that are not known locally: 6c0482d977a3
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files (py3 !)
remote: added 1 changesets with 1 changes to 1 files (no-py3 no-chg !)
remote: KABOOM remote: KABOOM
remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !)
$ hg -R ../remote heads $ hg -R ../remote heads
changeset: 5:1383141674ec changeset: 5:1383141674ec
tag: tip tag: tip
parent: 3:a28a9d1a809c parent: 3:a28a9d1a809c
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: z summary: z
$ echo localwrite > foo $ echo localwrite > foo
$ hg commit -m 'testing localwrite' $ hg commit -m 'testing localwrite'
$ hg push $ hg push
pushing to ssh://user@dummy/remote pushing to ssh://user@dummy/remote
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files (py3 !)
remote: added 1 changesets with 1 changes to 1 files (no-py3 no-chg !)
remote: KABOOM remote: KABOOM
remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !)
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote $ hg pull --debug ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)

tests/test-ssh.t

$ hg push $ hg push
pushing to ssh://user@dummy/remote pushing to ssh://user@dummy/remote
searching for changes searching for changes
remote has heads on branch 'default' that are not known locally: 6c0482d977a3 remote has heads on branch 'default' that are not known locally: 6c0482d977a3
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files (py3 !)
remote: added 1 changesets with 1 changes to 1 files (no-py3 no-chg !)
remote: KABOOM remote: KABOOM
remote: KABOOM IN PROCESS remote: KABOOM IN PROCESS
remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !)
$ hg -R ../remote heads $ hg -R ../remote heads
changeset: 5:1383141674ec changeset: 5:1383141674ec
tag: tip tag: tip
parent: 3:a28a9d1a809c parent: 3:a28a9d1a809c
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: z summary: z
$ echo localwrite > foo $ echo localwrite > foo
$ hg commit -m 'testing localwrite' $ hg commit -m 'testing localwrite'
$ hg push $ hg push
pushing to ssh://user@dummy/remote pushing to ssh://user@dummy/remote
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files (py3 !)
remote: added 1 changesets with 1 changes to 1 files (no-py3 no-chg !)
remote: KABOOM remote: KABOOM
remote: KABOOM IN PROCESS remote: KABOOM IN PROCESS
remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !)
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)

tests/test-transaction-rollback-on-sigpipe.t

$ hg --cwd ./remote tip -T '{node|short}\n' $ hg --cwd ./remote tip -T '{node|short}\n'
000000000000 000000000000
$ cd local $ cd local
$ echo foo > foo ; hg commit -qAm "commit" $ echo foo > foo ; hg commit -qAm "commit"
$ hg push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --remotecmd "$remotecmd" $ hg push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --remotecmd "$remotecmd"
pushing to ssh://user@dummy/$TESTTMP/remote pushing to ssh://user@dummy/$TESTTMP/remote
searching for changes searching for changes
remote: adding changesets remote: adding changesets (py3 !)
remote: adding manifests remote: adding manifests (py3 !)
remote: adding file changes remote: adding file changes (py3 !)
remote: adding changesets (no-py3 no-chg !)
remote: adding manifests (no-py3 no-chg !)
remote: adding file changes (no-py3 no-chg !)
abort: stream ended unexpectedly (got 0 bytes, expected 4) abort: stream ended unexpectedly (got 0 bytes, expected 4)
[255] [255]
$ cat $SIGPIPE_REMOTE_DEBUG_FILE $ cat $SIGPIPE_REMOTE_DEBUG_FILE
SIGPIPE-HELPER: Starting SIGPIPE-HELPER: Starting
SIGPIPE-HELPER: Mercurial started SIGPIPE-HELPER: Mercurial started
SIGPIPE-HELPER: Redirection in place SIGPIPE-HELPER: Redirection in place
SIGPIPE-HELPER: SYNCFILE1 detected SIGPIPE-HELPER: SYNCFILE1 detected
SIGPIPE-HELPER: pipes closed SIGPIPE-HELPER: pipes closed