This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5294

tests: make test-check-module-imports more robust
ClosedPublic

Authored by valentin.gatienbaron on Nov 21 2018, 1:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdd028bca9221: tests: make test-check-module-imports more robust
Summary

It failed for me without this in this way:

tests/test-commandserver.t:19: relative import of stdlib module
tests/test-lfs-serve.t:108: relative import of stdlib module
tests/test-lfs-serve.t:255: relative import of stdlib module
tests/test-lfs-serve.t:362: relative import of stdlib module
tests/test-lfs-serve.t:406: relative import of stdlib module
tests/test-lock.py:9: imports not lexically sorted: silenttestrunner < unittest, True, True
tests/test-lrucachedict.py:5: imports not lexically sorted: silenttestrunner < unittest, True, True
tests/test-match.py:5: imports not lexically sorted: silenttestrunner < unittest, True, True
tests/test-remotefilelog-datapack.py:15: imports not lexically sorted: silenttestrunner < unittest, True, True
tests/test-remotefilelog-histpack.py:14: imports not lexically sorted: silenttestrunner < unittest, True, True
tests/test-simplekeyvaluefile.py:4: imports not lexically sorted: silenttestrunner < unittest, True, True
tests/test-sshserver.py:6: imports not lexically sorted: silenttestrunner < unittest, True, True

This is because every module is considered a stdlib module, because
the stdlib_prefixes is /usr, and my repo is in /usr/local/home, which
means that sys.path contains a couple of
/usr/local/home/../hg/.. entries that count as "in the stdlib".
Fix this by preventing any path in sys.path that's inside the mercurial
source from being considered "in the stdlib".

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

valentin.gatienbaron edited the summary of this revision. (Show Details)Nov 21 2018, 1:25 PM
valentin.gatienbaron updated this revision to Diff 12580.
Closed by commit rHGdd028bca9221: tests: make test-check-module-imports more robust (authored by valentin.gatienbaron). · Explain WhyNov 22 2018, 8:33 AM
This revision was automatically updated to reflect the committed changes.
durin42 added a subscriber: durin42.Nov 22 2018, 11:09 PM

Very nice! I've been intermittently looking for this for a long time and never found it.

Revision Contents
Changeset List

PathPackages
Mcontrib/import-checker.py (8 lines)

Diff 12584

contrib/import-checker.py

continue continue
dirname = os.path.dirname(filename) dirname = os.path.dirname(filename)
for prefix in stdlib_prefixes: for prefix in stdlib_prefixes:
if dirname.startswith(prefix): if dirname.startswith(prefix):
# Then this directory is redundant. # Then this directory is redundant.
break break
else: else:
stdlib_prefixes.add(dirname) stdlib_prefixes.add(dirname)
sourceroot = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
for libpath in sys.path: for libpath in sys.path:
# We want to walk everything in sys.path that starts with # We want to walk everything in sys.path that starts with something in
# something in stdlib_prefixes. # stdlib_prefixes, but not directories from the hg sources.
if not any(libpath.startswith(p) for p in stdlib_prefixes): if (os.path.abspath(libpath).startswith(sourceroot)
or not any(libpath.startswith(p) for p in stdlib_prefixes)):
continue continue
for top, dirs, files in os.walk(libpath): for top, dirs, files in os.walk(libpath):
for i, d in reversed(list(enumerate(dirs))): for i, d in reversed(list(enumerate(dirs))):
if (not os.path.exists(os.path.join(top, d, '__init__.py')) if (not os.path.exists(os.path.join(top, d, '__init__.py'))
or top == libpath and d in ('hgdemandimport', 'hgext', or top == libpath and d in ('hgdemandimport', 'hgext',
'mercurial')): 'mercurial')):
del dirs[i] del dirs[i]
for name in files: for name in files: