This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9558

run-tests: configure the environment to expand `~` properly with Windows py38+
ClosedPublic

Authored by mharbison72 on Dec 9 2020, 11:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG08fd76a553c9: run-tests: configure the environment to expand `~` properly with Windows py38+
Summary

This was causing tests to point to the actual home path on the system, not the
test defined one.

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 (3 lines)
Mtests/test-template-map.t (1 line)

Diff 24163

tests/run-tests.py

env["HGPORT%s" % offset] = '%s' % (self._startport + i) env["HGPORT%s" % offset] = '%s' % (self._startport + i)
env = os.environ.copy() env = os.environ.copy()
env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or '' env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or ''
env['HGEMITWARNINGS'] = '1' env['HGEMITWARNINGS'] = '1'
env['TESTTMP'] = _bytes2sys(self._testtmp) env['TESTTMP'] = _bytes2sys(self._testtmp)
env['TESTNAME'] = self.name env['TESTNAME'] = self.name
env['HOME'] = _bytes2sys(self._testtmp) env['HOME'] = _bytes2sys(self._testtmp)
if os.name == 'nt':
# py3.8+ ignores HOME: https://bugs.python.org/issue36264
env['USERPROFILE'] = env['HOME']
formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1]) formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1])
env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout
env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout) env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout)
# This number should match portneeded in _getport # This number should match portneeded in _getport
for port in xrange(3): for port in xrange(3):
# This list should be parallel to _portmap in _getreplacements # This list should be parallel to _portmap in _getreplacements
defineport(port) defineport(port)
env["HGRCPATH"] = _bytes2sys(os.path.join(self._threadtmp, b'.hgrc')) env["HGRCPATH"] = _bytes2sys(os.path.join(self._threadtmp, b'.hgrc'))

tests/test-template-map.t

$ mkdir -p home/styles $ mkdir -p home/styles
$ cat > home/styles/teststyle <<EOF $ cat > home/styles/teststyle <<EOF
> changeset = 'test {rev}:{node|short}\n' > changeset = 'test {rev}:{node|short}\n'
> EOF > EOF
$ HOME=`pwd`/home; export HOME $ HOME=`pwd`/home; export HOME
$ USERPROFILE=`pwd`/home; export USERPROFILE
$ cat > latesttag/.hg/hgrc <<EOF $ cat > latesttag/.hg/hgrc <<EOF
> [ui] > [ui]
> style = ~/styles/teststyle > style = ~/styles/teststyle
> EOF > EOF
$ hg -R latesttag tip $ hg -R latesttag tip
test 11:97e5943b523a test 11:97e5943b523a