This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11047

run-tests: setup "correct" python earlier
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2ee81806831f: run-tests: setup "correct" python earlier
Summary

I don't see any good reason to wait. This result in slightly simpler code.

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 29082.Jul 9 2021, 9:21 PM

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

baymax updated this revision to Diff 29102.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:46 PM
marmoute updated this revision to Diff 29135.
marmoute added a commit: rHG2ee81806831f: run-tests: setup "correct" python earlier.Jul 11 2021, 10:48 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2ee81806831f: run-tests: setup "correct" python earlier (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29192

tests/run-tests.py

verbosity = 0 verbosity = 0
elif self.options.verbose: elif self.options.verbose:
verbosity = 2 verbosity = 2
runner = TextTestRunner(self, verbosity=verbosity) runner = TextTestRunner(self, verbosity=verbosity)
if self.options.list_tests: if self.options.list_tests:
result = runner.listtests(suite) result = runner.listtests(suite)
else: else:
self._usecorrectpython()
if self._installdir: if self._installdir:
self._installhg() self._installhg()
self._checkhglib("Testing") self._checkhglib("Testing")
else:
self._usecorrectpython()
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()
log( log(
for line in f: for line in f:
if PYTHON3: if PYTHON3:
sys.stdout.buffer.write(line) sys.stdout.buffer.write(line)
else: else:
sys.stdout.write(line) sys.stdout.write(line)
sys.exit(1) sys.exit(1)
os.chdir(self._testdir) os.chdir(self._testdir)
self._usecorrectpython()
hgbat = os.path.join(self._bindir, b'hg.bat') hgbat = os.path.join(self._bindir, b'hg.bat')
if os.path.isfile(hgbat): if os.path.isfile(hgbat):
# hg.bat expects to be put in bin/scripts while run-tests.py # hg.bat expects to be put in bin/scripts while run-tests.py
# installation layout put it in bin/ directly. Fix it # installation layout put it in bin/ directly. Fix it
with open(hgbat, 'rb') as f: with open(hgbat, 'rb') as f:
data = f.read() data = f.read()
if br'"%~dp0..\python" "%~dp0hg" %*' in data: if br'"%~dp0..\python" "%~dp0hg" %*' in data:
data = data.replace( data = data.replace(