This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11049

run-tests: introduce a `HGTEST_REAL_HG` variable for test
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGee1fc8f970e6: run-tests: introduce a `HGTEST_REAL_HG` variable for test
rHG7f7f57ceffa6: run-tests: introduce a `HGTEST_REAL_HG` variable for test
Summary

It turns out that currently, hg and which hg can point to different things
because hg is an alias… This is annoying because script and pieces of test
are unknowingly using the wrong hg.

We will fix it in another changeset. However some test actually need to use a
real hg binary and not some chg or rhg equivalent. So we introduce a new
variable with the right value and we put it to us in the appropriate location.

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

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

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

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

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

marmoute edited the summary of this revision. (Show Details)Jul 10 2021, 1:47 PM
marmoute updated this revision to Diff 29136.
mharbison72 added a subscriber: mharbison72.Jul 11 2021, 7:35 PM
mharbison72 added inline comments.
tests/run-tests.py
3164

Do we even need the assertion? When I passed None in as args, it raised an error.

Alphare added a subscriber: Alphare.Jul 13 2021, 11:57 AM
Alphare added inline comments.
tests/run-tests.py
3164

What would you expect to happen by passing None?

marmoute added a commit: rHG7f7f57ceffa6: run-tests: introduce a `HGTEST_REAL_HG` variable for test.Jul 13 2021, 12:26 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7f7f57ceffa6: run-tests: introduce a `HGTEST_REAL_HG` variable for test (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29222

tests/run-tests.py

# Force the use of hg.exe instead of relying on MSYS to recognize hg is # Force the use of hg.exe instead of relying on MSYS to recognize hg is
# a python script and feed it to python.exe. Legacy stdio is force # a python script and feed it to python.exe. Legacy stdio is force
# enabled by hg.exe, and this is a more realistic way to launch hg # enabled by hg.exe, and this is a more realistic way to launch hg
# anyway. # anyway.
if WINDOWS and not self._hgcommand.endswith(b'.exe'): if WINDOWS and not self._hgcommand.endswith(b'.exe'):
self._hgcommand += b'.exe' self._hgcommand += b'.exe'
real_hg = os.path.join(self._bindir, self._hgcommand)
assert real_hg is not None
mharbison72Unsubmitted
Not Done

Do we even need the assertion? When I passed None in as args, it raised an error.

mharbison72: Do we even need the assertion? When I passed `None` in as args, it raised an error.
AlphareUnsubmitted
Not Done

What would you expect to happen by passing None?

Alphare: What would you expect to happen by passing `None`?
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'CHGHG'] = os.path.join(self._bindir, self._hgcommand) osenvironb[b'CHGHG'] = real_hg
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)
# configure fallback and 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:
# Affects hghave.py # Affects hghave.py
osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1' osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1'
# Affects configuration. Alternatives would be setting configuration through # Affects configuration. Alternatives would be setting configuration through
# `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include # `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
# `--config` but that disrupts tests that print command lines and check expected # `--config` but that disrupts tests that print command lines and check expected
# output. # output.
osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback' osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = os.path.join( osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg
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

tests/test-hghave.t

$ cat > test-hghaveaddon.t <<EOF $ cat > test-hghaveaddon.t <<EOF
> #require custom > #require custom
> $ echo foo > $ echo foo
> foo > foo
> EOF > EOF
$ ( \ $ ( \
> testrepohgenv; \ > testrepohgenv; \
> "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` -j 1 \ > "$PYTHON" $TESTDIR/run-tests.py --with-hg=$HGTEST_REAL_HG -j 1 \
> $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t \ > $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t \
> ) > )
running 1 tests using 1 parallel processes running 1 tests using 1 parallel processes
. .
# Ran 1 tests, 0 skipped, 0 failed. # Ran 1 tests, 0 skipped, 0 failed.
(invocation via command line) (invocation via command line)

tests/test-run-tests.t

running 0 tests using 0 parallel processes running 0 tests using 0 parallel processes
# Ran 0 tests, 0 skipped, 0 failed. # Ran 0 tests, 0 skipped, 0 failed.
Define a helper to avoid the install step Define a helper to avoid the install step
============= =============
$ rt() $ rt()
> { > {
> "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` -j1 "$@" > "$PYTHON" $TESTDIR/run-tests.py --with-hg=$HGTEST_REAL_HG -j1 "$@"
> } > }
error paths error paths
#if symlink #if symlink
$ ln -s `which true` hg $ ln -s `which true` hg
$ "$PYTHON" $TESTDIR/run-tests.py --with-hg=./hg $ "$PYTHON" $TESTDIR/run-tests.py --with-hg=./hg
warning: --with-hg should specify an hg script, not: true warning: --with-hg should specify an hg script, not: true
$ echo 172.16.18.1 $ echo 172.16.18.1
$LOCALIP (glob) $LOCALIP (glob)
$ echo dead:beef::1 $ echo dead:beef::1
$LOCALIP (glob) $LOCALIP (glob)
Add support for external test formatter Add support for external test formatter
======================================= =======================================
$ CUSTOM_TEST_RESULT=basic_test_result "$PYTHON" $TESTDIR/run-tests.py --with-hg=`which hg` -j1 "$@" test-success.t test-failure.t $ CUSTOM_TEST_RESULT=basic_test_result "$PYTHON" $TESTDIR/run-tests.py --with-hg=$HGTEST_REAL_HG -j1 "$@" test-success.t test-failure.t
running 2 tests using 1 parallel processes running 2 tests using 1 parallel processes
# Ran 2 tests, 0 skipped, 0 failed. # Ran 2 tests, 0 skipped, 0 failed.
ON_START! <__main__.TestSuite tests=[<__main__.TTest testMethod=test-failure.t>, <__main__.TTest testMethod=test-success.t>]> ON_START! <__main__.TestSuite tests=[<__main__.TTest testMethod=test-failure.t>, <__main__.TTest testMethod=test-success.t>]>
FAILURE! test-failure.t output changed FAILURE! test-failure.t output changed
SUCCESS! test-success.t SUCCESS! test-success.t
ON_END! ON_END!