Merge lp:~cjwatson/lazr.config/zope.interface-5.0.0 into lp:lazr.config

[Colin Watson]

Fix tests with zope.interface >= 5.0.0.

This test was broken by https://github.com/zopefoundation/zope.interface/pull/174.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2019-11-04 17:08:58 +0000
+++ NEWS.rst	2021-01-25 22:58:11 +0000
@@ -2,6 +2,10 @@
 NEWS for lazr.config
 ====================
 
+2.2.3
+=====
+- Fix tests with zope.interface >= 5.0.0.
+
 2.2.2 (2019-11-04)
 ==================
 - Officially add support for Python 3.7 and 3.8.  The test suite required

=== modified file 'src/lazr/config/tests/test_config.py'
--- src/lazr/config/tests/test_config.py	2015-01-06 01:41:25 +0000
+++ src/lazr/config/tests/test_config.py	2021-01-25 22:58:11 +0000
@@ -158,10 +158,24 @@
                           UnknownKeyError, UnknownSectionError])
 
     def test_not_stackable(self):
+        try:
+            from zope.interface.exceptions import MultipleInvalid
+        except ImportError:  # zope.interface < 5.0.0
+            class MultipleInvalid(Exception):
+                pass
+
         schema = ConfigSchema(self._testfile('base.conf'))
         config = schema.load(self._testfile('local.conf'))
-        self.assertRaises(DoesNotImplement,
-                          verifyObject, IStackableConfig, config.extends)
+        try:
+            verifyObject(IStackableConfig, config.extends)
+        except DoesNotImplement:
+            pass
+        except MultipleInvalid as e:
+            if not any(isinstance(invalid, DoesNotImplement)
+                       for invalid in e.exceptions):
+                self.fail('MultipleInvalid raised without DoesNotImplement')
+        else:
+            self.fail('DoesNotImplement not raised')
 
     def test_bad_pop(self):
         schema = ConfigSchema(self._testfile('base.conf'))