This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2286

tests: actually check that HGDEMANDIMPORT=disable disables demandimport
ClosedPublic

Authored by martinvonz on Feb 16 2018, 2:40 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb39f0fdb0338: tests: actually check that HGDEMANDIMPORT=disable disables demandimport
rHG02bb24cf6fd9: tests: actually check that HGDEMANDIMPORT=disable disables demandimport
Summary

At the point in the test where we were checking that the 'node' got
eagerly loaded, it had already been loaded (via the pvec module), so
our check wasn't doing anything (i.e. the test would pass even if you
removed the line that set HGDEMANDIMPORT=disable). Let's move this
test earlier so it tests what it was meant to test.

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.Feb 16 2018, 2:40 PM
durin42 accepted this revision.Feb 16 2018, 5:06 PM
This revision is now accepted and ready to land.Feb 16 2018, 5:06 PM
Closed by commit rHG02bb24cf6fd9: tests: actually check that HGDEMANDIMPORT=disable disables demandimport (authored by martinvonz). · Explain WhyFeb 16 2018, 5:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5787

tests/test-demandimport.py

rsub = re.sub rsub = re.sub
def f(obj): def f(obj):
l = repr(obj) l = repr(obj)
l = rsub("0x[0-9a-fA-F]+", "0x?", l) l = rsub("0x[0-9a-fA-F]+", "0x?", l)
l = rsub("from '.*'", "from '?'", l) l = rsub("from '.*'", "from '?'", l)
l = rsub("'<[a-z]*>'", "'<whatever>'", l) l = rsub("'<[a-z]*>'", "'<whatever>'", l)
return l return l
demandimport.disable()
os.environ['HGDEMANDIMPORT'] = 'disable'
# this enable call should not actually enable demandimport!
demandimport.enable()
from mercurial import node
print("node =", f(node))
# now enable it for real
del os.environ['HGDEMANDIMPORT']
demandimport.enable()
import os import os
print("os =", f(os)) print("os =", f(os))
print("os.system =", f(os.system)) print("os.system =", f(os.system))
print("os =", f(os)) print("os =", f(os))
from mercurial import util from mercurial import util
# Unlike the import statement, __import__() function should not raise # Unlike the import statement, __import__() function should not raise
# ImportError even if fromlist has an unknown item # ImportError even if fromlist has an unknown item
# (see Python/import.c:import_module_level() and ensure_fromlist()) # (see Python/import.c:import_module_level() and ensure_fromlist())
contextlibimp = __import__('contextlib', globals(), locals(), ['unknownattr']) contextlibimp = __import__('contextlib', globals(), locals(), ['unknownattr'])
print("__import__('contextlib', ..., ['unknownattr']) =", f(contextlibimp)) print("__import__('contextlib', ..., ['unknownattr']) =", f(contextlibimp))
print("hasattr(contextlibimp, 'unknownattr') =", print("hasattr(contextlibimp, 'unknownattr') =",
util.safehasattr(contextlibimp, 'unknownattr')) util.safehasattr(contextlibimp, 'unknownattr'))
demandimport.disable()
os.environ['HGDEMANDIMPORT'] = 'disable'
# this enable call should not actually enable demandimport!
demandimport.enable()
from mercurial import node
print("node =", f(node))

tests/test-demandimport.py.out

node = <module 'mercurial.node' from '?'>
os = <unloaded module 'os'> os = <unloaded module 'os'>
os.system = <built-in function system> os.system = <built-in function system>
os = <module 'os' from '?'> os = <module 'os' from '?'>
util = <unloaded module 'util'> util = <unloaded module 'util'>
util.system = <function system at 0x?> util.system = <function system at 0x?>
util = <module 'mercurial.util' from '?'> util = <module 'mercurial.util' from '?'>
util.system = <function system at 0x?> util.system = <function system at 0x?>
hgweb = <unloaded module 'hgweb'> hgweb = <unloaded module 'hgweb'>
pvecproxy.__doc__ = 'A "pvec" is ...' pvecproxy.__doc__ = 'A "pvec" is ...'
pvecproxy.__name__ = 'mercurial.pvec' pvecproxy.__name__ = 'mercurial.pvec'
pvecproxy.__dict__['__name__'] = 'mercurial.pvec' pvecproxy.__dict__['__name__'] = 'mercurial.pvec'
pvecproxy = <proxied module 'pvec'> pvecproxy = <proxied module 'pvec'>
contextlib = <unloaded module 'contextlib'> contextlib = <unloaded module 'contextlib'>
contextlib.unknownattr = ImportError: cannot import name unknownattr contextlib.unknownattr = ImportError: cannot import name unknownattr
__import__('contextlib', ..., ['unknownattr']) = <module 'contextlib' from '?'> __import__('contextlib', ..., ['unknownattr']) = <module 'contextlib' from '?'>
hasattr(contextlibimp, 'unknownattr') = False hasattr(contextlibimp, 'unknownattr') = False
node = <module 'mercurial.node' from '?'>