This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7623

tests: make test-config-env.py a little less hacky
ClosedPublic

Authored by martinvonz on Dec 12 2019, 6:44 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG527eba3013ea: tests: make test-config-env.py a little less hacky
Summary

Overriding os.path.isdir to always returns False is very
confusing. Let's make it more explicit by specifically not returning
any defaultrc/ configs.

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

martinvonz created this revision.Dec 12 2019, 6:44 PM
indygreg accepted this revision.Dec 14 2019, 7:34 PM
This revision is now accepted and ready to land.Dec 14 2019, 7:34 PM
martinvonz added a commit: rHG527eba3013ea: tests: make test-config-env.py a little less hacky.Dec 14 2019, 10:11 PM
Closed by commit rHG527eba3013ea: tests: make test-config-env.py a little less hacky (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-config-env.py (4 lines)

Diff 18732

tests/test-config-env.py

# Test the config layer generated by environment variables # Test the config layer generated by environment variables
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import os import os
from mercurial import ( from mercurial import (
encoding, encoding,
extensions,
rcutil, rcutil,
ui as uimod, ui as uimod,
util, util,
) )
from mercurial.utils import procutil from mercurial.utils import procutil
testtmp = encoding.environ[b'TESTTMP'] testtmp = encoding.environ[b'TESTTMP']
def systemrcpath(): def systemrcpath():
return [join(b'sysrc')] return [join(b'sysrc')]
def userrcpath(): def userrcpath():
return [join(b'userrc')] return [join(b'userrc')]
extensions.wrapfunction(rcutil, 'defaultrcpath', lambda orig: [])
rcutil.systemrcpath = systemrcpath rcutil.systemrcpath = systemrcpath
rcutil.userrcpath = userrcpath rcutil.userrcpath = userrcpath
os.path.isdir = lambda x: False # hack: do not load default.d/*.rc
# utility to print configs # utility to print configs
def printconfigs(env): def printconfigs(env):
encoding.environ = env encoding.environ = env
rcutil._rccomponents = None # reset cache rcutil._rccomponents = None # reset cache
ui = uimod.ui.load() ui = uimod.ui.load()
for section, name, value in ui.walkconfig(): for section, name, value in ui.walkconfig():
source = ui.configsource(section, name) source = ui.configsource(section, name)