Mercurial > hg
diff tests/test-commit-multiple.t @ 40369:ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
I have no idea why these aren't flagged with python2. I excluded
test-highlight.t for now to make this easier to review- the changed code is
committed to a repo, which has cascading changes on the rest of the test.
There's a mix of bytes and str in the imports dict of contrib/import-checker.py
that crashed it half way through listing out these errors. I couldn't figure
out how to fix that properly, so I was lazy and applied this on py3, to find the
rest of the errors:
diff --git a/contrib/import-checker.py b/contrib/import-checker.py
--- a/contrib/import-checker.py
+++ b/contrib/import-checker.py
@@ -626,7 +626,12 @@ def find_cycles(imports):
top.foo -> top.qux -> top.foo
"""
cycles = set()
- for mod in sorted(imports.keys()):
+ def sort(v):
+ if isinstance(v, bytes):
+ return v.decode('ascii')
+ return v
+
+ for mod in sorted(imports.keys(), key=sort):
try:
checkmod(mod, imports)
except CircularImport as e:
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 17 Oct 2018 23:33:43 -0400 |
parents | 5abc47d4ca6b |
children | 9d38b4b52061 |
line wrap: on
line diff
--- a/tests/test-commit-multiple.t Thu Oct 18 21:55:47 2018 -0400 +++ b/tests/test-commit-multiple.t Wed Oct 17 23:33:43 2018 -0400 @@ -80,8 +80,8 @@ now test that we fixed the bug for all scripts/extensions $ cat > $TESTTMP/committwice.py <<__EOF__ - > from mercurial import ui, hg, match, node - > from time import sleep + > import time + > from mercurial import hg, match, node, ui as uimod > > def replacebyte(fn, b): > f = open(fn, "rb+") @@ -94,12 +94,12 @@ > % (rev, b', '.join(b"'%s'" % f > for f in repo[rev].files()))) > - > repo = hg.repository(ui.ui.load(), b'.') + > repo = hg.repository(uimod.ui.load(), b'.') > assert len(repo) == 6, \ > "initial: len(repo): %d, expected: 6" % len(repo) > > replacebyte(b"bugfix", b"u") - > sleep(2) + > time.sleep(2) > try: > repo.ui.status(b"PRE: len(repo): %d\n" % len(repo)) > wlock = repo.wlock()