Make tests resilient against different ways of calling them. (#345)

Author: icemac

CHANGES.rst

@@ -5,6 +5,8 @@
 8.1 (unreleased)
 ================
 
+- Make tests resilient against different ways of calling them.
+
 - Remove run-time dependency on ``setuptools``.
 
 

src/zope/interface/tests/test_declarations.py

@@ -26,6 +26,7 @@
 # pylint:disable=inherit-non-class,too-many-lines,protected-access
 # pylint:disable=blacklisted-name,attribute-defined-outside-init
 
+IBar = InterfaceClass('IBar')
 IFoo = InterfaceClass('IFoo')
 
 
@@ -1373,10 +1374,9 @@ def test__repr__directlyProvides_module(self):
         from zope.interface.declarations import alsoProvides
         from zope.interface.declarations import directlyProvides
         from zope.interface.tests import dummy
+        from zope.interface.tests.test_declarations import IBar
         from zope.interface.tests.test_declarations import IFoo
 
-        IBar = InterfaceClass('IBar')
-
         orig_provides = dummy.__provides__  # pylint:disable=no-member
         del dummy.__provides__  # pylint:disable=no-member
         self.addCleanup(setattr, dummy, '__provides__', orig_provides)
@@ -1401,7 +1401,7 @@ def test__repr__directlyProvides_module(self):
 
         # If we make this module also provide IFoo and IBar, then the repr
         # lists both names.
-        my_module = sys.modules[__name__]
+        from zope.interface.tests import test_declarations as my_module
         assert not hasattr(my_module, '__provides__')
 
         directlyProvides(my_module, IFoo, IBar)
@@ -1410,7 +1410,7 @@ def test__repr__directlyProvides_module(self):
         self.assertEqual(
             repr(provides),
             "directlyProvides(('zope.interface.tests.dummy', "
-            "'interface.tests.test_declarations'), "
+            "'zope.interface.tests.test_declarations'), "
             "IFoo, IBar)"
         )
 

src/zope/interface/tests/test_ro.py

@@ -12,8 +12,12 @@
 #
 ##############################################################################
 """Resolution ordering utility tests"""
+import doctest
+import re
 import unittest
 
+import zope.testing.renormalizing
+
 
 # pylint:disable=blacklisted-name
 # pylint:disable=protected-access
@@ -307,14 +311,29 @@ def _check_handler_complex_diamond(self):
     interface.tests.test_ro.D    interface.tests.test_ro.D
                                + interface.tests.test_ro.E
     interface.tests.test_ro.F    interface.tests.test_ro.F
-    zope.interface.Interface     zope.interface.Interface""".format(
+    interface.Interface          interface.Interface""".format(
             name="interface.tests.test_ro.A"
         )
 
-        self.assertEqual(
-            '\n'.join(ln.rstrip() for ln in record.getMessage().splitlines()),
-            expected,
+        checker = zope.testing.renormalizing.OutputChecker([
+            (re.compile(r'zope\.'), ''),  # zope is not always there
+            # space in headline is not consistent
+            (re.compile(
+                r'Legacy RO \(len=7\) +C3 RO \(len=7; inconsistent=no\)'),
+             'Legacy RO (len=7)  C3 RO (len=7; inconsistent=no)'),
+            (re.compile(r'=+'), ''),  # header underline length varies
+            (re.compile(r' +\+'), '    +'),  # table column spacing varies
+            (re.compile(r'interface\.Interface +interface\.Interface'),
+             'interface.Interface  interface.Interface'),
+            # spacing varies in last line
+        ]
         )
+        got = '\n'.join(ln.rstrip() for ln in record.getMessage().splitlines())
+        self.assertTrue(
+            checker.check_output(
+                expected, got, 0), checker.output_difference(
+                doctest.Example(
+                    got, expected), got, 0))
 
     def test_ExtendedPathIndex_implement_thing_implementedby_super(self):
         # See