# HG changeset patch # User Gregory Szorc # Date 1579329107 28800 # Node ID 97cc270c3ecc7087ab608066bc9ad2b9e60df165 # Parent 2928d5af628193e52ccad4530441ade3592696e4 py3: glob over exception in test-check-py3-compat.t Python 3.6+ raise ModuleNotFoundError and older versions raise ImportError. Glob over the exception differences. For whatever reason, we were already doing this for one failure. But not all occurrences of ModuleNotFoundError were changed. Who knows. This test should now pass on all Python versions (although I didn't check Windows). Differential Revision: https://phab.mercurial-scm.org/D7939 diff -r 2928d5af6281 -r 97cc270c3ecc tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t Fri Jan 17 22:24:27 2020 -0800 +++ b/tests/test-check-py3-compat.t Fri Jan 17 22:31:47 2020 -0800 @@ -41,9 +41,9 @@ hgext/infinitepush/sqlindexapi.py: error importing: <*Error> No module named 'mysql' (error at sqlindexapi.py:*) (glob) (?) mercurial/scmwindows.py: error importing: _type_ 'v' not supported (error at win32.py:*) (no-windows !) mercurial/win32.py: error importing: _type_ 'v' not supported (error at win32.py:*) (no-windows !) - mercurial/windows.py: error importing: No module named 'msvcrt' (error at windows.py:*) (no-windows !) - mercurial/posix.py: error importing: No module named 'fcntl' (error at posix.py:*) (windows !) - mercurial/scmposix.py: error importing: No module named 'fcntl' (error at scmposix.py:*) (windows !) + mercurial/windows.py: error importing: <*Error> No module named 'msvcrt' (error at windows.py:*) (glob) (no-windows !) + mercurial/posix.py: error importing: <*Error> No module named 'fcntl' (error at posix.py:*) (glob) (windows !) + mercurial/scmposix.py: error importing: <*Error> No module named 'fcntl' (error at scmposix.py:*) (glob) (windows !) #endif #if py3 pygments