This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5797

tests: use unimported modules in test-demandimport.py
ClosedPublic

Authored by indygreg on Feb 1 2019, 7:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG30248d6bc057: tests: use unimported modules in test-demandimport.py
rHG28ed6d3056cb: tests: use unimported modules in test-demandimport.py
rHG71a1a816a6d7: tests: use unimported modules in test-demandimport.py
rHG36e2dd4fb3d2: tests: use unimported modules in test-demandimport.py
Summary

contextlib isn't a good module to test because it is likely already
imported by code above. Let's use modules that shouldn't have been
imported. And let's verify that with asserts.

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

indygreg created this revision.Feb 1 2019, 7:48 PM
Closed by commit rHG36e2dd4fb3d2: tests: use unimported modules in test-demandimport.py (authored by indygreg). · Explain WhyFeb 1 2019, 8:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-demandimport.py (20 lines)

Diff 13688

tests/test-demandimport.py

assert f(re) == "<module 'sys' (built-in)>" assert f(re) == "<module 'sys' (built-in)>"
assert f(type(re.stderr)) == "<class '_io.TextIOWrapper'>", f(type(re.stderr)) assert f(type(re.stderr)) == "<class '_io.TextIOWrapper'>", f(type(re.stderr))
assert f(re) == "<module 'sys' (built-in)>" assert f(re) == "<module 'sys' (built-in)>"
else: else:
assert f(re) == "<unloaded module 'sys'>", f(re) assert f(re) == "<unloaded module 'sys'>", f(re)
assert f(re.stderr) == "<open file '<whatever>', mode 'w' at 0x?>", f(re.stderr) assert f(re.stderr) == "<open file '<whatever>', mode 'w' at 0x?>", f(re.stderr)
assert f(re) == "<proxied module 'sys'>", f(re) assert f(re) == "<proxied module 'sys'>", f(re)
import contextlib assert 'telnetlib' not in sys.modules
import telnetlib
if ispy3: if ispy3:
assert not isinstance(contextlib, _LazyModule) assert not isinstance(telnetlib, _LazyModule)
assert f(contextlib) == "<module 'contextlib' from '?'>" assert f(telnetlib) == "<module 'telnetlib' from '?'>"
else: else:
assert f(contextlib) == "<unloaded module 'contextlib'>", f(contextlib) assert f(telnetlib) == "<unloaded module 'telnetlib'>", f(telnetlib)
try: try:
from contextlib import unknownattr from telnetlib import unknownattr
assert False, ('no demandmod should be created for attribute of non-package ' assert False, ('no demandmod should be created for attribute of non-package '
'module:\ncontextlib.unknownattr = %s' % f(unknownattr)) 'module:\ntelnetlib.unknownattr = %s' % f(unknownattr))
except ImportError as inst: except ImportError as inst:
assert rsub(r"'", '', str(inst)).startswith('cannot import name unknownattr') assert rsub(r"'", '', str(inst)).startswith('cannot import name unknownattr')
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']) assert 'zipfile' not in sys.modules
assert f(contextlibimp) == "<module 'contextlib' from '?'>", f(contextlibimp) zipfileimp = __import__('zipfile', globals(), locals(), ['unknownattr'])
assert not util.safehasattr(contextlibimp, 'unknownattr') assert f(zipfileimp) == "<module 'zipfile' from '?'>", f(zipfileimp)
assert not util.safehasattr(zipfileimp, 'unknownattr')