# HG changeset patch # User Ian Moody # Date 2019-10-04 18:36:21 # Node ID 5ed1abd0ea263bae4d6fd1db9a47c9e2c52f79d8 # Parent c19b327017b9109d078f13427b978303ab6708d4 py3: fix test-bad-extension expectations for py35 ModuleNotFoundError was introduced in 3.6, so the tests need to expect to see ImportError with 3.5. Differential Revision: https://phab.mercurial-scm.org/D7063 diff --git a/tests/test-bad-extension.t b/tests/test-bad-extension.t --- a/tests/test-bad-extension.t +++ b/tests/test-bad-extension.t @@ -62,11 +62,14 @@ show traceback *** failed to import extension badext2: No module named *badext2* (glob) Traceback (most recent call last): ImportError: No module named badext2 (no-py3 !) - ModuleNotFoundError: No module named 'hgext.badext2' (py3 !) + ImportError: No module named 'hgext.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) Traceback (most recent call last): (py3 !) - ModuleNotFoundError: No module named 'hgext3rd.badext2' (py3 !) + ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) Traceback (most recent call last): (py3 !) - ModuleNotFoundError: No module named 'badext2' (py3 !) + ImportError: No module named 'badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'badext2' (py36 !) names of extensions failed to load can be accessed via extensions.notloaded() @@ -108,20 +111,26 @@ show traceback for ImportError of hgext. YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext.badext2 (No module named *badext2*): trying hgext3rd.badext2 (glob) Traceback (most recent call last): ImportError: No module named badext2 (no-py3 !) - ModuleNotFoundError: No module named 'hgext.badext2' (py3 !) + ImportError: No module named 'hgext.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext3rd.badext2 (No module named *badext2*): trying badext2 (glob) Traceback (most recent call last): ImportError: No module named badext2 (no-py3 !) - ModuleNotFoundError: No module named 'hgext.badext2' (py3 !) + ImportError: No module named 'hgext.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) Traceback (most recent call last): (py3 !) - ModuleNotFoundError: No module named 'hgext3rd.badext2' (py3 !) + ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) *** failed to import extension badext2: No module named *badext2* (glob) Traceback (most recent call last): - ModuleNotFoundError: No module named 'hgext.badext2' (py3 !) + ImportError: No module named 'hgext.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) Traceback (most recent call last): (py3 !) - ModuleNotFoundError: No module named 'hgext3rd.badext2' (py3 !) + ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) + ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) Traceback (most recent call last): (py3 !) - ModuleNotFoundError: No module named 'badext2' (py3 !) + ModuleNotFoundError: No module named 'badext2' (py36 !) + ImportError: No module named 'badext2' (py3 no-py36 !) ImportError: No module named badext2 (no-py3 !) YYYY/MM/DD HH:MM:SS (PID)> > loaded 2 extensions, total time * (glob) YYYY/MM/DD HH:MM:SS (PID)> - loading configtable attributes