This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10941

run-tests: clarify pyexename assignement
ClosedPublic

Authored by marmoute on Jul 2 2021, 6:37 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG50829b9149b0: run-tests: clarify pyexename assignement
Summary

That assignement is wrong, we clarify that it is wrong before starting to fix
it. This will make the fix clearer.

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 2 2021, 6:37 PM
Alphare accepted this revision.Jul 5 2021, 5:33 AM
This revision is now accepted and ready to land.Jul 5 2021, 5:33 AM
baymax updated this revision to Diff 28825.Jul 6 2021, 10:14 AM

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

marmoute added a commit: rHG50829b9149b0: run-tests: clarify pyexename assignement.Jul 6 2021, 10:35 AM
Closed by commit rHG50829b9149b0: run-tests: clarify pyexename assignement (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 28833

tests/run-tests.py

try: try:
os.remove(f) os.remove(f)
except OSError: except OSError:
pass pass
def _usecorrectpython(self): def _usecorrectpython(self):
"""Configure the environment to use the appropriate Python in tests.""" """Configure the environment to use the appropriate Python in tests."""
# Tests must use the same interpreter as us or bad things will happen. # Tests must use the same interpreter as us or bad things will happen.
pyexename = sys.platform == 'win32' and b'python.exe' or b'python3' if sys.platform == 'win32':
pyexename = b'python.exe'
else:
pyexename = b'python3' # XXX this is wrong with python2...
# os.symlink() is a thing with py3 on Windows, but it requires # os.symlink() is a thing with py3 on Windows, but it requires
# Administrator rights. # Administrator rights.
if getattr(os, 'symlink', None) and os.name != 'nt': if getattr(os, 'symlink', None) and os.name != 'nt':
msg = "# Making python executable in test path a symlink to '%s'" msg = "# Making python executable in test path a symlink to '%s'"
msg %= sysexecutable msg %= sysexecutable
vlog(msg) vlog(msg)
mypython = os.path.join(self._tmpbindir, pyexename) mypython = os.path.join(self._tmpbindir, pyexename)