Mercurial > hg

changeset 43191:5ed1abd0ea26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Ian Moody <moz-ian@perix.co.uk>
date Fri, 04 Oct 2019 19:36:21 +0100
parents c19b327017b9
children ce20b870041f
files tests/test-bad-extension.t
diffstat 1 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-bad-extension.t	Sun Oct 06 16:57:26 2019 +0100
+++ b/tests/test-bad-extension.t	Fri Oct 04 19:36:21 2019 +0100
@@ -62,11 +62,14 @@
   *** 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 @@
   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