Merge pull request #145 from zopefoundation/issue144

Fix a test failure against zope.interface5 due to overly specific exception tests.

CHANGES.rst

@@ -4,7 +4,8 @@
 4.6.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fix an overly specific test failure using zope.interface 5. See
+  `issue 144 <https://github.com/zopefoundation/persistent/issues/144>`_.
 
 
 4.6.3 (2020-03-18)

persistent/tests/test_picklecache.py

@@ -1124,13 +1124,13 @@ def test_inst_does_not_conform_to_IExtendedPickleCache(self):
         # interface declaration to the C implementation.
         from persistent.interfaces import IExtendedPickleCache
         from zope.interface.verify import verifyObject
-        from zope.interface.exceptions import DoesNotImplement
-        from zope.interface.exceptions import BrokenImplementation
+        from zope.interface.exceptions import Invalid
         # We don't claim to implement it.
-        with self.assertRaises(DoesNotImplement):
-            verifyObject(IExtendedPickleCache, self._makeOne())
+        self.assertFalse(IExtendedPickleCache.providedBy(self._makeOne()))
         # And we don't even provide everything it asks for.
-        with self.assertRaises(BrokenImplementation):
+        # (Exact error depends on version of zope.interface and what we
+        # fail to implement. 5.0 probably raises MultipleInvalid).
+        with self.assertRaises(Invalid):
             verifyObject(IExtendedPickleCache, self._makeOne(), tentative=True)
 
     def test___setitem___persistent_class(self):