Mercurial > hg
view tests/test-demandimport.py @ 46415:8deab876fb59 stable
wix: tell ComponentSearch that it is finding a directory (not a file)
This is to fix an issue we've noticed where fresh installations start at
`C:\Program Files\Mercurial`, and then upgrades "walk up" the tree and end up in
`C:\Program Files` and finally `C:\` (where they stay).
ComponentSearch defaults to finding files, which I think means "it produces a
string like `C:\Program Files\Mercurial`", whereas with the type being
explicitly a directory, it would return `C:\Program Files\Mercurial\` (note the
final trailing backslash). Presumably, a latter step then tries to turn that
file name into a proper directory, by removing everything after the last `\`.
This could likely also be fixed by actually searching for the component for
hg.exe itself. That seemed a lot more complicated, as the GUID for hg.exe isn't
known in this file (it's one of the "auto-derived" ones). We could also consider
adding a Condition that I think could check the Property and ensure it's either
empty or ends in a trailing slash, but that would be an installer runtime check
and I'm not convinced it'd actually be useful.
This will *not* cause existing installations that are in one of the bad
directories to fix themselves. Doing that would require a fair amount more
understanding of wix and windows installer than I have, and it *probably*
wouldn't be possible to be 100% correct about it either (there's nothing
preventing a user from intentionally installing it in C:\, though I don't know
why they would do so).
If someone wants to tackle fixing existing installations, I think that the first
installation is actually the only one that shows up in "Add or Remove Programs",
and that its registry keys still exist. You might be able to find something
under HKEY_USERS that lists both the "good" and the "bad" InstallDirs. Mine was
under `HKEY_USERS\S-1-5-18\Software\Mercurial\InstallDir` (C:\), and
`HKEY_USERS\S-1-5-21-..numbers..\Software\Mercurial\InstallDir` (C:\Program
Files\Mercurial). If you find exactly two, with one being the default path, and
the other being a prefix of it, the user almost certainly hit this bug :D
We had originally thought that this bug might be due to unattended
installations/upgrades, but I no longer think that's the case. We were able to
reproduce the issue by uninstalling all copies of Mercurial I could find,
installing one version (it chose the correct location), and then starting the
installer for a different version (higher or lower didn't matter). I did not
need to deal with an unattended or headless installation/upgrade to trigger the
issue, but it's possible that my system was "primed" for this bug to happen
because of a previous unattended installation/upgrade.
Differential Revision: https://phab.mercurial-scm.org/D9891
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Wed, 27 Jan 2021 10:29:21 -0800 |
parents | 0826d684a1b5 |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import, print_function from mercurial import demandimport demandimport.enable() import os import subprocess import sys import types # Don't import pycompat because it has too many side-effects. ispy3 = sys.version_info[0] >= 3 # Only run if demandimport is allowed if subprocess.call( [os.environ['PYTHON'], '%s/hghave' % os.environ['TESTDIR'], 'demandimport'] ): sys.exit(80) # We rely on assert, which gets optimized out. if sys.flags.optimize: sys.exit(80) # The demand importer doesn't work on Python 3.5. if sys.version_info[0:2] == (3, 5): sys.exit(80) if ispy3: from importlib.util import _LazyModule try: from importlib.util import _Module as moduletype except ImportError: moduletype = types.ModuleType else: moduletype = types.ModuleType if os.name != 'nt': try: import distutils.msvc9compiler print( 'distutils.msvc9compiler needs to be an immediate ' 'importerror on non-windows platforms' ) distutils.msvc9compiler except ImportError: pass import re rsub = re.sub def f(obj): l = repr(obj) l = rsub("0x[0-9a-fA-F]+", "0x?", l) l = rsub("from '.*'", "from '?'", l) l = rsub("'<[a-z]*>'", "'<whatever>'", l) return l demandimport.disable() os.environ['HGDEMANDIMPORT'] = 'disable' # this enable call should not actually enable demandimport! demandimport.enable() from mercurial import node # We use assert instead of a unittest test case because having imports inside # functions changes behavior of the demand importer. if ispy3: assert not isinstance(node, _LazyModule) else: assert f(node) == "<module 'mercurial.node' from '?'>", f(node) # now enable it for real del os.environ['HGDEMANDIMPORT'] demandimport.enable() # Test access to special attributes through demandmod proxy assert 'mercurial.error' not in sys.modules from mercurial import error as errorproxy if ispy3: # unsure why this isn't lazy. assert not isinstance(f, _LazyModule) assert f(errorproxy) == "<module 'mercurial.error' from '?'>", f(errorproxy) else: assert f(errorproxy) == "<unloaded module 'error'>", f(errorproxy) doc = ' '.join(errorproxy.__doc__.split()[:3]) assert doc == 'Mercurial exceptions. This', doc assert errorproxy.__name__ == 'mercurial.error', errorproxy.__name__ # __name__ must be accessible via __dict__ so the relative imports can be # resolved name = errorproxy.__dict__['__name__'] assert name == 'mercurial.error', name if ispy3: assert not isinstance(errorproxy, _LazyModule) assert f(errorproxy) == "<module 'mercurial.error' from '?'>", f(errorproxy) else: assert f(errorproxy) == "<proxied module 'error'>", f(errorproxy) import os if ispy3: assert not isinstance(os, _LazyModule) assert f(os) == "<module 'os' from '?'>", f(os) else: assert f(os) == "<unloaded module 'os'>", f(os) assert f(os.system) == '<built-in function system>', f(os.system) assert f(os) == "<module 'os' from '?'>", f(os) assert 'mercurial.utils.procutil' not in sys.modules from mercurial.utils import procutil if ispy3: assert isinstance(procutil, _LazyModule) assert f(procutil) == "<module 'mercurial.utils.procutil' from '?'>", f( procutil ) else: assert f(procutil) == "<unloaded module 'procutil'>", f(procutil) assert f(procutil.system) == '<function system at 0x?>', f(procutil.system) assert procutil.__class__ == moduletype, procutil.__class__ assert f(procutil) == "<module 'mercurial.utils.procutil' from '?'>", f( procutil ) assert f(procutil.system) == '<function system at 0x?>', f(procutil.system) assert 'mercurial.hgweb' not in sys.modules from mercurial import hgweb if ispy3: assert isinstance(hgweb, _LazyModule) assert f(hgweb) == "<module 'mercurial.hgweb' from '?'>", f(hgweb) assert isinstance(hgweb.hgweb_mod, _LazyModule) assert ( f(hgweb.hgweb_mod) == "<module 'mercurial.hgweb.hgweb_mod' from '?'>" ), f(hgweb.hgweb_mod) else: assert f(hgweb) == "<unloaded module 'hgweb'>", f(hgweb) assert f(hgweb.hgweb_mod) == "<unloaded module 'hgweb_mod'>", f( hgweb.hgweb_mod ) assert f(hgweb) == "<module 'mercurial.hgweb' from '?'>", f(hgweb) import re as fred if ispy3: assert not isinstance(fred, _LazyModule) assert f(fred) == "<module 're' from '?'>" else: assert f(fred) == "<unloaded module 're'>", f(fred) import re as remod if ispy3: assert not isinstance(remod, _LazyModule) assert f(remod) == "<module 're' from '?'>" else: assert f(remod) == "<unloaded module 're'>", f(remod) import sys as re if ispy3: assert not isinstance(re, _LazyModule) assert f(re) == "<module 'sys' (built-in)>" else: assert f(re) == "<unloaded module 'sys'>", f(re) if ispy3: assert not isinstance(fred, _LazyModule) assert f(fred) == "<module 're' from '?'>", f(fred) else: assert f(fred) == "<unloaded module 're'>", f(fred) assert f(fred.sub) == '<function sub at 0x?>', f(fred.sub) if ispy3: assert not isinstance(fred, _LazyModule) assert f(fred) == "<module 're' from '?'>", f(fred) else: assert f(fred) == "<proxied module 're'>", f(fred) remod.escape # use remod assert f(remod) == "<module 're' from '?'>", f(remod) if ispy3: assert not isinstance(re, _LazyModule) assert f(re) == "<module 'sys' (built-in)>" assert f(type(re.stderr)) == "<class '_io.TextIOWrapper'>", f( type(re.stderr) ) assert f(re) == "<module 'sys' (built-in)>" else: 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) == "<proxied module 'sys'>", f(re) assert 'telnetlib' not in sys.modules import telnetlib if ispy3: assert isinstance(telnetlib, _LazyModule) assert f(telnetlib) == "<module 'telnetlib' from '?'>" else: assert f(telnetlib) == "<unloaded module 'telnetlib'>", f(telnetlib) try: from telnetlib import unknownattr assert False, ( 'no demandmod should be created for attribute of non-package ' 'module:\ntelnetlib.unknownattr = %s' % f(unknownattr) ) except ImportError as inst: assert rsub(r"'", '', str(inst)).startswith( 'cannot import name unknownattr' ) from mercurial import util # Unlike the import statement, __import__() function should not raise # ImportError even if fromlist has an unknown item # (see Python/import.c:import_module_level() and ensure_fromlist()) assert 'ftplib' not in sys.modules zipfileimp = __import__('ftplib', globals(), locals(), ['unknownattr']) assert f(zipfileimp) == "<module 'ftplib' from '?'>", f(zipfileimp) assert not util.safehasattr(zipfileimp, 'unknownattr')