Merge cd19711 into 2c430dd

zopefoundation · Oct 22, 2018 · 2e99848 · 2e99848
2 parents 2c430dd + cd19711
commit 2e99848
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/BTrees/tests/common.py b/BTrees/tests/common.py
@@ -376,11 +376,10 @@ def testShortRepr(self):
             self.assertTrue(r.endswith(repr(t.items()) + ')'), r)
         else:
             # persistent-4.4 changed the default reprs, adding
-            # oid and jar reprs, but eliminating the module prefix
-            # in one implementation
+            # oid and jar reprs
+            self.assertIn("<BTrees.", r)
             self.assertIn('BTree object at', r)
-            self.assertIn('oid', r)
-            self.assertIn('12345678', r)
+            self.assertIn('oid 0x3132333435363738', r)
 
         # Make sure it's the same between Python and C
         self.assertNotIn('Py', r)
@@ -1396,11 +1395,11 @@ def testShortRepr(self):
             self.assertTrue(r.endswith("Set(%r)" % t.keys()))
         else:
             # persistent-4.4 changed the default reprs, adding
-            # oid and jar reprs, but eliminating the module prefix
-            # in one implementation
+            # oid and jar reprs
+            self.assertIn("<BTrees.", r)
             self.assertIn('TreeSet object at', r)
-            self.assertIn('oid', r)
-            self.assertIn('12345678', r)
+            self.assertIn('oid 0x3132333435363738', r)
+
         # Make sure it's the same between Python and C
         self.assertNotIn('Py', r)
 

diff --git a/setup.py b/setup.py
@@ -140,7 +140,7 @@ def BTreeExtension(family):
 TESTS_REQUIRE = [
     # Our tests check for the new repr strings
     # generated in persistent 4.4.
-    'persistent >= 4.4.2',
+    'persistent >= 4.4.3',
     'transaction',
     'zope.testrunner',
 ]