This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10095

tests: Add `--rhg` and `--with-rhg=<path>` options for `run-tests.py`
ClosedPublic

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

Details

Reviewers
Alphare
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfb2368598281: tests: Add `--rhg` and `--with-rhg=<path>` options for `run-tests.py`
Summary

They are mostly equivalent to the corresponding chg options.
For now, many tests are still failing in this configuration.
It is *not* run on CI.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Mar 3 2021, 12:09 PM
baymax updated this revision to Diff 26069.Mar 4 2021, 8:00 AM

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

Alphare accepted this revision.Mar 5 2021, 3:44 AM
marmoute accepted this revision.Mar 9 2021, 12:59 PM
pulkit accepted this revision.Mar 10 2021, 1:32 PM
This revision is now accepted and ready to land.Mar 10 2021, 1:32 PM
SimonSapin added a comment.Mar 11 2021, 5:21 PM

I intentionally placed this patch (D10095) in a stack on top of D10094 as it is based on the premise that what the parent does is done. Now the discussion in D10094 is leaning towards doing something different instead, and ideally this patch would also be affected. But it has already been merged, before its parent. Also the default branch is in a broken state at the moment (though CI for this is not enabled yet).

Now admittedly some other patches in this stack *are* truly independent (in terms of semantics, not just lack of merge conflict) and can be merged in any order and it may not be obvious which is which. Still, I feel that this Phabricator workflow is problematic and wish for Merge Requests where the submitter can designate which sequences of commits are to be merged atomically.

Revision Contents
Changeset List

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

Diff 26231

tests/run-tests.py

action="store_true", action="store_true",
help="install and use chg wrapper in place of hg", help="install and use chg wrapper in place of hg",
) )
hgconf.add_argument( hgconf.add_argument(
"--chg-debug", "--chg-debug",
action="store_true", action="store_true",
help="show chg debug logs", help="show chg debug logs",
) )
hgconf.add_argument(
"--rhg",
action="store_true",
help="install and use rhg Rust implementation in place of hg",
)
hgconf.add_argument("--compiler", help="compiler to build with") hgconf.add_argument("--compiler", help="compiler to build with")
hgconf.add_argument( hgconf.add_argument(
'--extra-config-opt', '--extra-config-opt',
action="append", action="append",
default=[], default=[],
help='set the given config opt in the test hgrc', help='set the given config opt in the test hgrc',
) )
hgconf.add_argument( hgconf.add_argument(
"-l", "-l",
"--local", "--local",
action="store_true", action="store_true",
help="shortcut for --with-hg=<testdir>/../hg, " help="shortcut for --with-hg=<testdir>/../hg, "
"--with-rhg=<testdir>/../rust/target/release/rhg if --rhg is set, "
"and --with-chg=<testdir>/../contrib/chg/chg if --chg is set", "and --with-chg=<testdir>/../contrib/chg/chg if --chg is set",
) )
hgconf.add_argument( hgconf.add_argument(
"--ipv6", "--ipv6",
action="store_true", action="store_true",
help="prefer IPv6 to IPv4 for network related tests", help="prefer IPv6 to IPv4 for network related tests",
) )
hgconf.add_argument( hgconf.add_argument(
help="do not use Rust code even if compiled", help="do not use Rust code even if compiled",
) )
hgconf.add_argument( hgconf.add_argument(
"--with-chg", "--with-chg",
metavar="CHG", metavar="CHG",
help="use specified chg wrapper in place of hg", help="use specified chg wrapper in place of hg",
) )
hgconf.add_argument( hgconf.add_argument(
"--with-rhg",
metavar="RHG",
help="use specified rhg Rust implementation in place of hg",
)
hgconf.add_argument(
"--with-hg", "--with-hg",
metavar="HG", metavar="HG",
help="test using specified hg script rather than a " help="test using specified hg script rather than a "
"temporary installation", "temporary installation",
) )
reporting = parser.add_argument_group('Results Reporting') reporting = parser.add_argument_group('Results Reporting')
reporting.add_argument( reporting.add_argument(
if options.pure and options.rust: if options.pure and options.rust:
parser.error('--rust cannot be used with --pure') parser.error('--rust cannot be used with --pure')
if options.rust and options.no_rust: if options.rust and options.no_rust:
parser.error('--rust cannot be used with --no-rust') parser.error('--rust cannot be used with --no-rust')
if options.local: if options.local:
if options.with_hg or options.with_chg: if options.with_hg or options.with_rhg or options.with_chg:
parser.error('--local cannot be used with --with-hg or --with-chg') parser.error(
'--local cannot be used with --with-hg or --with-rhg or --with-chg'
)
testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0]))) testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0])))
reporootdir = os.path.dirname(testdir) reporootdir = os.path.dirname(testdir)
pathandattrs = [(b'hg', 'with_hg')] pathandattrs = [(b'hg', 'with_hg')]
if options.chg: if options.chg:
pathandattrs.append((b'contrib/chg/chg', 'with_chg')) pathandattrs.append((b'contrib/chg/chg', 'with_chg'))
if options.rhg:
pathandattrs.append((b'rust/target/release/rhg', 'with_rhg'))
for relpath, attr in pathandattrs: for relpath, attr in pathandattrs:
binpath = os.path.join(reporootdir, relpath) binpath = os.path.join(reporootdir, relpath)
if os.name != 'nt' and not os.access(binpath, os.X_OK): if os.name != 'nt' and not os.access(binpath, os.X_OK):
parser.error( parser.error(
'--local specified, but %r not found or ' '--local specified, but %r not found or '
'not executable' % binpath 'not executable' % binpath
) )
setattr(options, attr, _bytes2sys(binpath)) setattr(options, attr, _bytes2sys(binpath))
if options.with_hg: if options.with_hg:
options.with_hg = canonpath(_sys2bytes(options.with_hg)) options.with_hg = canonpath(_sys2bytes(options.with_hg))
if not ( if not (
os.path.isfile(options.with_hg) os.path.isfile(options.with_hg)
and os.access(options.with_hg, os.X_OK) and os.access(options.with_hg, os.X_OK)
): ):
parser.error('--with-hg must specify an executable hg script') parser.error('--with-hg must specify an executable hg script')
if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']: if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']:
sys.stderr.write('warning: --with-hg should specify an hg script\n') sys.stderr.write('warning: --with-hg should specify an hg script\n')
sys.stderr.flush() sys.stderr.flush()
if (options.chg or options.with_chg) and os.name == 'nt': if (options.chg or options.with_chg) and os.name == 'nt':
parser.error('chg does not work on %s' % os.name) parser.error('chg does not work on %s' % os.name)
if (options.rhg or options.with_rhg) and os.name == 'nt':
parser.error('rhg does not work on %s' % os.name)
if options.with_chg: if options.with_chg:
options.chg = False # no installation to temporary location options.chg = False # no installation to temporary location
options.with_chg = canonpath(_sys2bytes(options.with_chg)) options.with_chg = canonpath(_sys2bytes(options.with_chg))
if not ( if not (
os.path.isfile(options.with_chg) os.path.isfile(options.with_chg)
and os.access(options.with_chg, os.X_OK) and os.access(options.with_chg, os.X_OK)
): ):
parser.error('--with-chg must specify a chg executable') parser.error('--with-chg must specify a chg executable')
if options.with_rhg:
options.rhg = False # no installation to temporary location
options.with_rhg = canonpath(_sys2bytes(options.with_rhg))
if not (
os.path.isfile(options.with_rhg)
and os.access(options.with_rhg, os.X_OK)
):
parser.error('--with-rhg must specify a rhg executable')
if options.chg and options.with_hg: if options.chg and options.with_hg:
# chg shares installation location with hg # chg shares installation location with hg
parser.error( parser.error(
'--chg does not work when --with-hg is specified ' '--chg does not work when --with-hg is specified '
'(use --with-chg instead)' '(use --with-chg instead)'
) )
if options.rhg and options.with_hg:
# rhg shares installation location with hg
parser.error(
'--rhg does not work when --with-hg is specified '
'(use --with-rhg instead)'
)
if options.rhg and options.chg:
parser.error('--rhg and --chg do not work together')
if options.color == 'always' and not pygmentspresent: if options.color == 'always' and not pygmentspresent:
sys.stderr.write( sys.stderr.write(
'warning: --color=always ignored because ' 'warning: --color=always ignored because '
'pygments is not installed\n' 'pygments is not installed\n'
) )
if options.bisect_repo and not options.known_good_rev: if options.bisect_repo and not options.known_good_rev:
timeout=None, timeout=None,
startport=None, startport=None,
extraconfigopts=None, extraconfigopts=None,
shell=None, shell=None,
hgcommand=None, hgcommand=None,
slowtimeout=None, slowtimeout=None,
usechg=False, usechg=False,
chgdebug=False, chgdebug=False,
rhg_fallback_exe=None,
useipv6=False, useipv6=False,
): ):
"""Create a test from parameters. """Create a test from parameters.
path is the full path to the file defining the test. path is the full path to the file defining the test.
tmpdir is the main temporary directory to use for this test. tmpdir is the main temporary directory to use for this test.
self._timeout = timeout self._timeout = timeout
self._slowtimeout = slowtimeout self._slowtimeout = slowtimeout
self._startport = startport self._startport = startport
self._extraconfigopts = extraconfigopts or [] self._extraconfigopts = extraconfigopts or []
self._shell = _sys2bytes(shell) self._shell = _sys2bytes(shell)
self._hgcommand = hgcommand or b'hg' self._hgcommand = hgcommand or b'hg'
self._usechg = usechg self._usechg = usechg
self._chgdebug = chgdebug self._chgdebug = chgdebug
self._rhg_fallback_exe = rhg_fallback_exe
self._useipv6 = useipv6 self._useipv6 = useipv6
self._aborted = False self._aborted = False
self._daemonpids = [] self._daemonpids = []
self._finished = None self._finished = None
self._ret = None self._ret = None
self._out = None self._out = None
self._skipped = None self._skipped = None
b'usercache = %s\n' b'usercache = %s\n'
% (os.path.join(self._testtmp, b'.cache/lfs')) % (os.path.join(self._testtmp, b'.cache/lfs'))
) )
hgrc.write(b'[web]\n') hgrc.write(b'[web]\n')
hgrc.write(b'address = localhost\n') hgrc.write(b'address = localhost\n')
hgrc.write(b'ipv6 = %r\n' % self._useipv6) hgrc.write(b'ipv6 = %r\n' % self._useipv6)
hgrc.write(b'server-header = testing stub value\n') hgrc.write(b'server-header = testing stub value\n')
if self._rhg_fallback_exe:
hgrc.write(b'[rhg]\n')
hgrc.write(
b'fallback-executable = %s\n' % self._rhg_fallback_exe
)
for opt in self._extraconfigopts: for opt in self._extraconfigopts:
section, key = _sys2bytes(opt).split(b'.', 1) section, key = _sys2bytes(opt).split(b'.', 1)
assert b'=' in key, ( assert b'=' in key, (
'extra config opt %s must ' 'have an = for assignment' % opt 'extra config opt %s must ' 'have an = for assignment' % opt
) )
hgrc.write(b'[%s]\n%s\n' % (section, key)) hgrc.write(b'[%s]\n%s\n' % (section, key))
def fail(self, msg): def fail(self, msg):
self._hgtmp = None self._hgtmp = None
self._installdir = None self._installdir = None
self._bindir = None self._bindir = None
self._tmpbindir = None self._tmpbindir = None
self._pythondir = None self._pythondir = None
self._coveragefile = None self._coveragefile = None
self._createdfiles = [] self._createdfiles = []
self._hgcommand = None self._hgcommand = None
self._rhg_fallback_exe = None
self._hgpath = None self._hgpath = None
self._portoffset = 0 self._portoffset = 0
self._ports = {} self._ports = {}
def run(self, args, parser=None): def run(self, args, parser=None):
"""Run the test suite.""" """Run the test suite."""
oldmask = os.umask(0o22) oldmask = os.umask(0o22)
try: try:
else: else:
osenvironb.pop(b'CHGHG', None) # drop flag for hghave osenvironb.pop(b'CHGHG', None) # drop flag for hghave
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)
# set fallback executable path, then replace "hg" command by "rhg"
rhgbindir = self._bindir
if self.options.rhg or self.options.with_rhg:
self._rhg_fallback_exe = os.path.join(self._bindir, self._hgcommand)
if self.options.rhg:
self._hgcommand = b'rhg'
elif self.options.with_rhg:
rhgbindir = os.path.dirname(os.path.realpath(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
fileb = _sys2bytes(__file__) fileb = _sys2bytes(__file__)
runtestdir = os.path.abspath(os.path.dirname(fileb)) runtestdir = os.path.abspath(os.path.dirname(fileb))
osenvironb[b'RUNTESTDIR'] = runtestdir osenvironb[b'RUNTESTDIR'] = runtestdir
if PYTHON3: if PYTHON3:
sepb = _sys2bytes(os.pathsep) sepb = _sys2bytes(os.pathsep)
else: else:
sepb = os.pathsep sepb = os.pathsep
path = [self._bindir, runtestdir] + osenvironb[b"PATH"].split(sepb) path = [self._bindir, runtestdir] + osenvironb[b"PATH"].split(sepb)
if os.path.islink(__file__): if os.path.islink(__file__):
# test helper will likely be at the end of the symlink # test helper will likely be at the end of the symlink
realfile = os.path.realpath(fileb) realfile = os.path.realpath(fileb)
realdir = os.path.abspath(os.path.dirname(realfile)) realdir = os.path.abspath(os.path.dirname(realfile))
path.insert(2, realdir) path.insert(2, realdir)
if chgbindir != self._bindir: if chgbindir != self._bindir:
path.insert(1, chgbindir) path.insert(1, chgbindir)
if rhgbindir != self._bindir:
path.insert(1, rhgbindir)
if self._testdir != runtestdir: if self._testdir != runtestdir:
path = [self._testdir] + path path = [self._testdir] + path
if self._tmpbindir != self._bindir: if self._tmpbindir != self._bindir:
path = [self._tmpbindir] + path path = [self._tmpbindir] + path
osenvironb[b"PATH"] = sepb.join(path) osenvironb[b"PATH"] = sepb.join(path)
# Include TESTDIR in PYTHONPATH so that out-of-tree extensions # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
# can run .../tests/run-tests.py test-foo where test-foo # can run .../tests/run-tests.py test-foo where test-foo
first=self.options.first, first=self.options.first,
timeout=self.options.timeout, timeout=self.options.timeout,
startport=self._getport(count), startport=self._getport(count),
extraconfigopts=self.options.extra_config_opt, extraconfigopts=self.options.extra_config_opt,
shell=self.options.shell, shell=self.options.shell,
hgcommand=self._hgcommand, hgcommand=self._hgcommand,
usechg=bool(self.options.with_chg or self.options.chg), usechg=bool(self.options.with_chg or self.options.chg),
chgdebug=self.options.chg_debug, chgdebug=self.options.chg_debug,
rhg_fallback_exe=self._rhg_fallback_exe,
useipv6=useipv6, useipv6=useipv6,
**kwds **kwds
) )
t.should_reload = True t.should_reload = True
return t return t
def _cleanup(self): def _cleanup(self):
"""Clean up state from this test invocation.""" """Clean up state from this test invocation."""