This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9557

run-tests: fix `HGTESTEXTRAEXTENSIONS` with py3
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGaf3a6900f893: run-tests: fix `HGTESTEXTRAEXTENSIONS` with py3
Summary

Since extensions was a str and section bytes, it never populated anything.
If it had, it would have put bytes into the environment dictionary that is all
str. As everything starts and ends as str, remove the incomplete attempt at
byteification. It doesn't appear that we had any test coverage of this bit of
code, so also add a non-extension config to make sure it is filtered out
properly.

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 (6 lines)
Mtests/test-run-tests.t (5 lines)

Diff 24162

tests/run-tests.py

# If we don't have HGTESTCATAPULTSERVERPIPE explicitly set, pull the # If we don't have HGTESTCATAPULTSERVERPIPE explicitly set, pull the
# non-test one in as a default, otherwise set to devnull # non-test one in as a default, otherwise set to devnull
env['HGTESTCATAPULTSERVERPIPE'] = env.get( env['HGTESTCATAPULTSERVERPIPE'] = env.get(
'HGCATAPULTSERVERPIPE', os.devnull 'HGCATAPULTSERVERPIPE', os.devnull
) )
extraextensions = [] extraextensions = []
for opt in self._extraconfigopts: for opt in self._extraconfigopts:
section, key = _sys2bytes(opt).split(b'.', 1) section, key = opt.split('.', 1)
if section != 'extensions': if section != 'extensions':
continue continue
name = key.split(b'=', 1)[0] name = key.split('=', 1)[0]
extraextensions.append(name) extraextensions.append(name)
if extraextensions: if extraextensions:
env['HGTESTEXTRAEXTENSIONS'] = b' '.join(extraextensions) env['HGTESTEXTRAEXTENSIONS'] = ' '.join(extraextensions)
# LOCALIP could be ::1 or 127.0.0.1. Useful for tests that require raw # LOCALIP could be ::1 or 127.0.0.1. Useful for tests that require raw
# IP addresses. # IP addresses.
env['LOCALIP'] = _bytes2sys(self._localip()) env['LOCALIP'] = _bytes2sys(self._localip())
# This has the same effect as Py_LegacyWindowsStdioFlag in exewrapper.c, # This has the same effect as Py_LegacyWindowsStdioFlag in exewrapper.c,
# but this is needed for testing python instances like dummyssh, # but this is needed for testing python instances like dummyssh,
# dummysmtpd.py, and dumbhttp.py. # dummysmtpd.py, and dumbhttp.py.

tests/test-run-tests.t

python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
--extra-config-opt works --extra-config-opt works
$ cat << EOF >> test-config-opt.t $ cat << EOF >> test-config-opt.t
> $ hg init test-config-opt > $ hg init test-config-opt
> $ hg -R test-config-opt purge > $ hg -R test-config-opt purge
> $ echo "HGTESTEXTRAEXTENSIONS: \$HGTESTEXTRAEXTENSIONS"
> HGTESTEXTRAEXTENSIONS: purge
> EOF > EOF
$ rt --extra-config-opt extensions.purge= test-config-opt.t $ rt --extra-config-opt extensions.purge= \
> --extra-config-opt not.an.extension=True test-config-opt.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.
Test conditional output matching Test conditional output matching
================================ ================================
$ cat << EOF >> test-conditional-matching.t $ cat << EOF >> test-conditional-matching.t