This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10187

tests: Enable rhg fallback to Python by default in tests
ClosedPublic

Authored by SimonSapin on Mar 12 2021, 5:06 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGa6553ba1c598: tests: Enable rhg fallback to Python by default in tests
Summary

This premise of run-tests.py --rhg: fallback should make
rhg behave the same as hg, except faster in some cases.
To test run the whole test suite with installed rhg as hg
and with fallback enabled.

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.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (21 lines)
Mtests/test-rhg.t (87 lines)

Diff 26404

tests/run-tests.py

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" # configure fallback and 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) # Affects configuration. Alternatives would be setting configuration through
# `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
# `--config` but that disrupts tests that print command lines and check expected
# output.
osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = os.path.join(
self._bindir, self._hgcommand
)
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
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."""

tests/test-rhg.t

#require rust #require rust
Define an rhg function that will only run if rhg exists Define an rhg function that will only run if rhg exists
$ RHG="$RUNTESTDIR/../rust/target/release/rhg" $ RHG="$RUNTESTDIR/../rust/target/release/rhg"
$ rhg() { $ rhg() {
> if [ -f "$RHG" ]; then > if [ -f "$RHG" ]; then
> "$RHG" "$@" > "$RHG" "$@"
> else > else
> echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg." > echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg."
> exit 80 > exit 80
> fi > fi
> } > }
$ NO_FALLBACK="env RHG_ON_UNSUPPORTED=abort"
Unimplemented command Unimplemented command
$ rhg unimplemented-command $ $NO_FALLBACK rhg unimplemented-command
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>
For more information try --help For more information try --help
[252] [252]
$ rhg unimplemented-command --config rhg.on-unsupported=abort-silent $ rhg unimplemented-command --config rhg.on-unsupported=abort-silent
[252] [252]
Finding root Finding root
$ rhg root $ $NO_FALLBACK rhg root
abort: no repository found in '$TESTTMP' (.hg not found)! abort: no repository found in '$TESTTMP' (.hg not found)!
[255] [255]
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ rhg root $ $NO_FALLBACK rhg root
$TESTTMP/repository $TESTTMP/repository
Reading and setting configuration Reading and setting configuration
$ echo "[ui]" >> $HGRCPATH $ echo "[ui]" >> $HGRCPATH
$ echo "username = user1" >> $HGRCPATH $ echo "username = user1" >> $HGRCPATH
$ rhg config ui.username $ $NO_FALLBACK rhg config ui.username
user1 user1
$ echo "[ui]" >> .hg/hgrc $ echo "[ui]" >> .hg/hgrc
$ echo "username = user2" >> .hg/hgrc $ echo "username = user2" >> .hg/hgrc
$ rhg config ui.username $ $NO_FALLBACK rhg config ui.username
user2 user2
$ rhg --config ui.username=user3 config ui.username $ $NO_FALLBACK rhg --config ui.username=user3 config ui.username
user3 user3
Unwritable file descriptor Unwritable file descriptor
$ rhg root > /dev/full $ $NO_FALLBACK rhg root > /dev/full
abort: No space left on device (os error 28) abort: No space left on device (os error 28)
[255] [255]
Deleted repository Deleted repository
$ rm -rf `pwd` $ rm -rf `pwd`
$ rhg root $ $NO_FALLBACK rhg root
abort: $ENOENT$: current directory abort: $ENOENT$: current directory
[255] [255]
Listing tracked files Listing tracked files
$ cd $TESTTMP $ cd $TESTTMP
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ for i in 1 2 3; do $ for i in 1 2 3; do
> echo $i >> file$i > echo $i >> file$i
> hg add file$i > hg add file$i
> done > done
> hg commit -m "commit $i" -q > hg commit -m "commit $i" -q
Listing tracked files from root Listing tracked files from root
$ rhg files $ $NO_FALLBACK rhg files
file1 file1
file2 file2
file3 file3
Listing tracked files from subdirectory Listing tracked files from subdirectory
$ mkdir -p path/to/directory $ mkdir -p path/to/directory
$ cd path/to/directory $ cd path/to/directory
$ rhg files $ $NO_FALLBACK rhg files
../../../file1 ../../../file1
../../../file2 ../../../file2
../../../file3 ../../../file3
Listing tracked files through broken pipe Listing tracked files through broken pipe
$ rhg files | head -n 1 $ $NO_FALLBACK rhg files | head -n 1
../../../file1 ../../../file1
Debuging data in inline index Debuging data in inline index
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf repository $ rm -rf repository
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ for i in 1 2 3 4 5 6; do $ for i in 1 2 3 4 5 6; do
> echo $i >> file-$i > echo $i >> file-$i
> hg add file-$i > hg add file-$i
> hg commit -m "Commit $i" -q > hg commit -m "Commit $i" -q
> done > done
$ rhg debugdata -c 2 $ $NO_FALLBACK rhg debugdata -c 2
8d0267cb034247ebfa5ee58ce59e22e57a492297 8d0267cb034247ebfa5ee58ce59e22e57a492297
test test
0 0 0 0
file-3 file-3
Commit 3 (no-eol) Commit 3 (no-eol)
$ rhg debugdata -m 2 $ $NO_FALLBACK rhg debugdata -m 2
file-1\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc) file-1\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
file-2\x005d9299349fc01ddd25d0070d149b124d8f10411e (esc) file-2\x005d9299349fc01ddd25d0070d149b124d8f10411e (esc)
file-3\x002661d26c649684b482d10f91960cc3db683c38b4 (esc) file-3\x002661d26c649684b482d10f91960cc3db683c38b4 (esc)
Debuging with full node id Debuging with full node id
$ rhg debugdata -c `hg log -r 0 -T '{node}'` $ $NO_FALLBACK rhg debugdata -c `hg log -r 0 -T '{node}'`
d1d1c679d3053e8926061b6f45ca52009f011e3f d1d1c679d3053e8926061b6f45ca52009f011e3f
test test
0 0 0 0
file-1 file-1
Commit 1 (no-eol) Commit 1 (no-eol)
Specifying revisions by changeset ID Specifying revisions by changeset ID
$ hg log -T '{node}\n' $ hg log -T '{node}\n'
c6ad58c44207b6ff8a4fbbca7045a5edaa7e908b c6ad58c44207b6ff8a4fbbca7045a5edaa7e908b
d654274993d0149eecc3cc03214f598320211900 d654274993d0149eecc3cc03214f598320211900
f646af7e96481d3a5470b695cf30ad8e3ab6c575 f646af7e96481d3a5470b695cf30ad8e3ab6c575
cf8b83f14ead62b374b6e91a0e9303b85dfd9ed7 cf8b83f14ead62b374b6e91a0e9303b85dfd9ed7
91c6f6e73e39318534dc415ea4e8a09c99cd74d6 91c6f6e73e39318534dc415ea4e8a09c99cd74d6
6ae9681c6d30389694d8701faf24b583cf3ccafe 6ae9681c6d30389694d8701faf24b583cf3ccafe
$ rhg files -r cf8b83 $ $NO_FALLBACK rhg files -r cf8b83
file-1 file-1
file-2 file-2
file-3 file-3
$ rhg cat -r cf8b83 file-2 $ $NO_FALLBACK rhg cat -r cf8b83 file-2
2 2
$ rhg cat -r c file-2 $ $NO_FALLBACK rhg cat -r c file-2
abort: ambiguous revision identifier c abort: ambiguous revision identifier c
[255] [255]
$ rhg cat -r d file-2 $ $NO_FALLBACK rhg cat -r d file-2
2 2
Cat files Cat files
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf repository $ rm -rf repository
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ echo "original content" > original $ echo "original content" > original
$ hg add original $ hg add original
$ hg commit -m "add original" original $ hg commit -m "add original" original
$ rhg cat -r 0 original $ $NO_FALLBACK rhg cat -r 0 original
original content original content
Cat copied file should not display copy metadata Cat copied file should not display copy metadata
$ hg copy original copy_of_original $ hg copy original copy_of_original
$ hg commit -m "add copy of original" $ hg commit -m "add copy of original"
$ rhg cat -r 1 copy_of_original $ $NO_FALLBACK rhg cat -r 1 copy_of_original
original content original content
Fallback to Python Fallback to Python
$ rhg cat original $ $NO_FALLBACK rhg cat original
unsupported feature: `rhg cat` without `--rev` / `-r` unsupported feature: `rhg cat` without `--rev` / `-r`
[252] [252]
$ FALLBACK="--config rhg.on-unsupported=fallback" $ rhg cat original
$ rhg cat original $FALLBACK
original content original content
$ rhg cat original $FALLBACK --config rhg.fallback-executable=false $ rhg cat original --config rhg.fallback-executable=false
[1] [1]
$ rhg cat original $FALLBACK --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 $FALLBACK --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 = */rust/target/release/rhg' config points to `rhg` itself. (glob)
unsupported feature: `rhg cat` without `--rev` / `-r` unsupported feature: `rhg cat` without `--rev` / `-r`
[252] [252]
Requirements Requirements
$ rhg debugrequirements $ $NO_FALLBACK rhg debugrequirements
dotencode dotencode
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog
store store
$ echo indoor-pool >> .hg/requires $ echo indoor-pool >> .hg/requires
$ rhg files $ $NO_FALLBACK rhg files
unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool
[252] [252]
$ rhg cat -r 1 copy_of_original $ $NO_FALLBACK rhg cat -r 1 copy_of_original
unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool
[252] [252]
$ rhg debugrequirements $ $NO_FALLBACK rhg debugrequirements
unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool
[252] [252]
$ echo -e '\xFF' >> .hg/requires $ echo -e '\xFF' >> .hg/requires
$ rhg debugrequirements $ $NO_FALLBACK rhg debugrequirements
abort: corrupted repository: parse error in 'requires' file abort: corrupted repository: parse error in 'requires' file
[255] [255]
Persistent nodemap Persistent nodemap
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf repository $ rm -rf repository
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ rhg debugrequirements | grep nodemap $ $NO_FALLBACK rhg debugrequirements | grep nodemap
[1] [1]
$ hg debugbuilddag .+5000 --overwritten-file --config "storage.revlog.nodemap.mode=warn" $ hg debugbuilddag .+5000 --overwritten-file --config "storage.revlog.nodemap.mode=warn"
$ hg id -r tip $ hg id -r tip
c3ae8dec9fad tip c3ae8dec9fad tip
$ ls .hg/store/00changelog* $ ls .hg/store/00changelog*
.hg/store/00changelog.d .hg/store/00changelog.d
.hg/store/00changelog.i .hg/store/00changelog.i
$ rhg files -r c3ae8dec9fad $ $NO_FALLBACK rhg files -r c3ae8dec9fad
of of
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf repository $ rm -rf repository
$ hg --config format.use-persistent-nodemap=True init repository $ hg --config format.use-persistent-nodemap=True init repository
$ cd repository $ cd repository
$ rhg debugrequirements | grep nodemap $ $NO_FALLBACK rhg debugrequirements | grep nodemap
persistent-nodemap persistent-nodemap
$ hg debugbuilddag .+5000 --overwritten-file --config "storage.revlog.nodemap.mode=warn" $ hg debugbuilddag .+5000 --overwritten-file --config "storage.revlog.nodemap.mode=warn"
$ hg id -r tip $ hg id -r tip
c3ae8dec9fad tip c3ae8dec9fad tip
$ ls .hg/store/00changelog* $ ls .hg/store/00changelog*
.hg/store/00changelog-*.nd (glob) .hg/store/00changelog-*.nd (glob)
.hg/store/00changelog.d .hg/store/00changelog.d
.hg/store/00changelog.i .hg/store/00changelog.i
.hg/store/00changelog.n .hg/store/00changelog.n
Specifying revisions by changeset ID Specifying revisions by changeset ID
$ rhg files -r c3ae8dec9fad $ $NO_FALLBACK rhg files -r c3ae8dec9fad
of of
$ rhg cat -r c3ae8dec9fad of $ $NO_FALLBACK rhg cat -r c3ae8dec9fad of
r5000 r5000
Crate a shared repository Crate a shared repository
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "share = " >> $HGRCPATH $ echo "share = " >> $HGRCPATH
$ cd $TESTTMP $ cd $TESTTMP
$ hg init repo1 $ hg init repo1
$ echo a > repo1/a $ echo a > repo1/a
$ hg -R repo1 commit -A -m'init' $ hg -R repo1 commit -A -m'init'
adding a adding a
$ hg share repo1 repo2 $ hg share repo1 repo2
updating working directory updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
And check that basic rhg commands work with sharing And check that basic rhg commands work with sharing
$ rhg files -R repo2 $ $NO_FALLBACK rhg files -R repo2
repo2/a repo2/a
$ rhg -R repo2 cat -r 0 repo2/a $ $NO_FALLBACK rhg -R repo2 cat -r 0 repo2/a
a a
Same with relative sharing Same with relative sharing
$ hg share repo2 repo3 --relative $ hg share repo2 repo3 --relative
updating working directory updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rhg files -R repo3 $ $NO_FALLBACK rhg files -R repo3
repo3/a repo3/a
$ rhg -R repo3 cat -r 0 repo3/a $ $NO_FALLBACK rhg -R repo3 cat -r 0 repo3/a
a a
Same with share-safe Same with share-safe
$ echo "[format]" >> $HGRCPATH $ echo "[format]" >> $HGRCPATH
$ echo "use-share-safe = True" >> $HGRCPATH $ echo "use-share-safe = True" >> $HGRCPATH
$ cd $TESTTMP $ cd $TESTTMP
$ hg init repo4 $ hg init repo4
$ cd repo4 $ cd repo4
$ echo a > a $ echo a > a
$ hg commit -A -m'init' $ hg commit -A -m'init'
adding a adding a
$ cd .. $ cd ..
$ hg share repo4 repo5 $ hg share repo4 repo5
updating working directory updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
And check that basic rhg commands work with sharing And check that basic rhg commands work with sharing
$ cd repo5 $ cd repo5
$ rhg files $ $NO_FALLBACK rhg files
a a
$ rhg cat -r 0 a $ $NO_FALLBACK rhg cat -r 0 a
a a
The blackbox extension is supported The blackbox extension is supported
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "blackbox =" >> $HGRCPATH $ echo "blackbox =" >> $HGRCPATH
$ echo "[blackbox]" >> $HGRCPATH $ echo "[blackbox]" >> $HGRCPATH
$ echo "maxsize = 1" >> $HGRCPATH $ echo "maxsize = 1" >> $HGRCPATH
$ rhg files > /dev/null $ $NO_FALLBACK rhg files > /dev/null
$ cat .hg/blackbox.log $ cat .hg/blackbox.log
????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files exited 0 after 0.??? seconds (glob) ????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files exited 0 after 0.??? seconds (glob)
$ cat .hg/blackbox.log.1 $ cat .hg/blackbox.log.1
????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files (glob) ????/??/?? ??:??:??.??? * @d3873e73d99ef67873dac33fbcc66268d5d2b6f4 (*)> (rust) files (glob)