Patchwork [2,of,5,STABLE,pypy] test-extension: glob module name in error message for PyPy

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 2, 2017, 2:22 p.m.
Message ID <50ed00ce37627070546e.1501683742@mimosa>
Download mbox | patch
Permalink /patch/22637/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 2, 2017, 2:22 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1501679205 -32400
#      Wed Aug 02 22:06:45 2017 +0900
# Branch stable
# Node ID 50ed00ce37627070546e40305460ec378bb121fb
# Parent  4291548fe6ee8bf5249d73c1eefbb145818e1318
test-extension: glob module name in error message for PyPy

Patch

diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -1674,7 +1674,7 @@  Make sure a broken uisetup doesn't globa
 
 Even though the extension fails during uisetup, hg is still basically usable:
   $ hg version
-  *** failed to set up extension baduisetup: No module named bdiff
+  \*\*\* failed to set up extension baduisetup: No module named (mercurial\.)?bdiff (re)
   Mercurial Distributed SCM (version *) (glob)
   (see https://mercurial-scm.org for more information)
   
@@ -1696,8 +1696,8 @@  Even though the extension fails during u
       mod = _hgextimport(_origimport, head, globals, locals, None, level)
     File "*/hgdemandimport/demandimportpy2.py", line *, in _hgextimport (glob)
       return importfunc(name, globals, *args, **kwargs)
-  ImportError: No module named bdiff
-  *** failed to set up extension baduisetup: No module named bdiff
+  ImportError: No module named (mercurial\.)?bdiff (re)
+  \*\*\* failed to set up extension baduisetup: No module named (mercurial\.)?bdiff (re)
   Mercurial Distributed SCM (version *) (glob)
   (see https://mercurial-scm.org for more information)