This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2287

tests: avoid referring to pvec in demandimport test
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc2c5f9f6fa21: tests: avoid referring to pvec in demandimport test
rHG2234fe1af5dd: tests: avoid referring to pvec in demandimport test
rHG0ae9fe9952b5: tests: avoid referring to pvec in demandimport test
Summary

Nothing else currently uses pvec, so we may want to delete it (but
Augie Fackler says he may want to use it). To enable deletion, this
patch replaces it by the error module in the demandimport test (any
module works). However, since the error module had already been loaded
at this point in the test (via the util module), I moved it earlier in
the test so it's still not loaded (although I'm not sure if that's
even relevant to the 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 added a subscriber: durin42.Feb 16 2018, 5:06 PM

+1 on decoupling this from pvec, but per discussion on D2288 revise commit message per pvec's (temporary) stay of execution?

martinvonz edited the summary of this revision. (Show Details)Feb 16 2018, 5:16 PM
martinvonz added a comment.Feb 16 2018, 5:21 PM
In D2287#37835, @durin42 wrote:

+1 on decoupling this from pvec, but per discussion on D2288 revise commit message per pvec's (temporary) stay of execution?

Done

durin42 accepted this revision.Feb 16 2018, 5:22 PM
This revision is now accepted and ready to land.Feb 16 2018, 5:22 PM
Closed by commit rHG0ae9fe9952b5: tests: avoid referring to pvec in demandimport test (authored by martinvonz). · Explain WhyFeb 16 2018, 5:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5790

tests/test-demandimport.py

# this enable call should not actually enable demandimport! # this enable call should not actually enable demandimport!
demandimport.enable() demandimport.enable()
from mercurial import node from mercurial import node
print("node =", f(node)) print("node =", f(node))
# now enable it for real # now enable it for real
del os.environ['HGDEMANDIMPORT'] del os.environ['HGDEMANDIMPORT']
demandimport.enable() demandimport.enable()
# Test access to special attributes through demandmod proxy
from mercurial import error as errorproxy
print("errorproxy =", f(errorproxy))
print("errorproxy.__doc__ = %r"
% (' '.join(errorproxy.__doc__.split()[:3]) + ' ...'))
print("errorproxy.__name__ = %r" % errorproxy.__name__)
# __name__ must be accessible via __dict__ so the relative imports can be
# resolved
print("errorproxy.__dict__['__name__'] = %r" % errorproxy.__dict__['__name__'])
print("errorproxy =", f(errorproxy))
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
remod.escape # use remod remod.escape # use remod
print("remod =", f(remod)) print("remod =", f(remod))
print("re =", f(re)) print("re =", f(re))
print("re.stderr =", f(re.stderr)) print("re.stderr =", f(re.stderr))
print("re =", f(re)) print("re =", f(re))
# Test access to special attributes through demandmod proxy
from mercurial import pvec as pvecproxy
print("pvecproxy =", f(pvecproxy))
print("pvecproxy.__doc__ = %r"
% (' '.join(pvecproxy.__doc__.split()[:3]) + ' ...'))
print("pvecproxy.__name__ = %r" % pvecproxy.__name__)
# __name__ must be accessible via __dict__ so the relative imports can be
# resolved
print("pvecproxy.__dict__['__name__'] = %r" % pvecproxy.__dict__['__name__'])
print("pvecproxy =", f(pvecproxy))
import contextlib import contextlib
print("contextlib =", f(contextlib)) print("contextlib =", f(contextlib))
try: try:
from contextlib import unknownattr from contextlib import unknownattr
print('no demandmod should be created for attribute of non-package ' print('no demandmod should be created for attribute of non-package '
'module:\ncontextlib.unknownattr =', f(unknownattr)) 'module:\ncontextlib.unknownattr =', f(unknownattr))
except ImportError as inst: except ImportError as inst:
print('contextlib.unknownattr = ImportError: %s' print('contextlib.unknownattr = ImportError: %s'

tests/test-demandimport.py.out

node = <module 'mercurial.node' from '?'> node = <module 'mercurial.node' from '?'>
errorproxy = <unloaded module 'error'>
errorproxy.__doc__ = 'Mercurial exceptions. This ...'
errorproxy.__name__ = 'mercurial.error'
errorproxy.__dict__['__name__'] = 'mercurial.error'
errorproxy = <proxied module 'error'>
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'>
hgweb_mod = <unloaded module 'hgweb_mod'> hgweb_mod = <unloaded module 'hgweb_mod'>
hgweb = <module 'mercurial.hgweb' from '?'> hgweb = <module 'mercurial.hgweb' from '?'>
fred = <unloaded module 're'> fred = <unloaded module 're'>
remod = <unloaded module 're'> remod = <unloaded module 're'>
re = <unloaded module 'sys'> re = <unloaded module 'sys'>
fred = <unloaded module 're'> fred = <unloaded module 're'>
fred.sub = <function sub at 0x?> fred.sub = <function sub at 0x?>
fred = <proxied module 're'> fred = <proxied module 're'>
remod = <module 're' from '?'> remod = <module 're' from '?'>
re = <unloaded module 'sys'> re = <unloaded module 'sys'>
re.stderr = <open file '<whatever>', mode 'w' at 0x?> re.stderr = <open file '<whatever>', mode 'w' at 0x?>
re = <proxied module 'sys'> re = <proxied module 'sys'>
pvecproxy = <unloaded module 'pvec'>
pvecproxy.__doc__ = 'A "pvec" is ...'
pvecproxy.__name__ = 'mercurial.pvec'
pvecproxy.__dict__['__name__'] = 'mercurial.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