Use the renormalizing.IGNORE_EXCEPTION_MODULE_IN_PYTHON2

zopefoundation · Sep 30, 2016 · 4784b3a · 4784b3a
1 parent 4a1424e
commit 4784b3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/grokcore/annotation/tests/annotation/implementsmany.py b/src/grokcore/annotation/tests/annotation/implementsmany.py
@@ -5,10 +5,8 @@
 
   >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
-  martian.error.GrokError: <class
-  'grokcore.annotation.tests.annotation.implementsmany.MammothAnnotations'> is
-  implementing more than one interface (use grok.provides to specify
-  which one to use).
+  ...
+  martian.error.GrokError: <class 'grokcore.annotation.tests.annotation.implementsmany.MammothAnnotations'> is implementing more than one interface (use grok.provides to specify which one to use).
 """
 
 import grokcore.annotation as grok

diff --git a/src/grokcore/annotation/tests/annotation/implementsnone.py b/src/grokcore/annotation/tests/annotation/implementsnone.py
@@ -5,9 +5,8 @@
 
   >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
-  martian.error.GrokError: <class 'grokcore.annotation.tests.annotation.implementsnone.Branding'>
-  must implement at least one interface (use grok.implements to
-  specify).
+  ...
+  martian.error.GrokError: <class 'grokcore.annotation.tests.annotation.implementsnone.Branding'> must implement at least one interface (use grok.implements to specify).
 
 """
 

diff --git a/src/grokcore/annotation/tests/test_grok.py b/src/grokcore/annotation/tests/test_grok.py
@@ -22,9 +22,7 @@ def cleanUpZope(test):
     (re.compile(
         r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
         r'ConfigurationExecutionError: \1:'),
-    (re.compile(
-        r"^GrokError: "),
-        r"martian.error.GrokError: ")])
+    ])
 
 
 def suiteFromPackage(name):
@@ -44,7 +42,11 @@ def suiteFromPackage(name):
             setUp=setUpZope,
             tearDown=cleanUpZope,
             checker=checker,
-            optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
+            optionflags=(
+                doctest.ELLIPSIS +
+                doctest.NORMALIZE_WHITESPACE +
+                renormalizing.IGNORE_EXCEPTION_MODULE_IN_PYTHON2)
+            )
 
         suite.addTest(test)
     return suite