[Zope-Checkins] CVS: ZODB3/ZODB/tests - PackableStorage.py:1.29

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv2980

Modified Files:
	PackableStorage.py 
Log Message:
Revert previous checkin: It doesn't work for ZEO.


=== ZODB3/ZODB/tests/PackableStorage.py 1.28 => 1.29 ===
--- ZODB3/ZODB/tests/PackableStorage.py:1.28	Fri Jan 16 11:46:57 2004
+++ ZODB3/ZODB/tests/PackableStorage.py	Fri Jan 16 12:09:26 2004
@@ -474,12 +474,13 @@
         packt2 = time.time()
 
         db.pack(packt2)
-        if isinstance(self._storage, FileStorage):
-            # If FileStorage performed a redundant pack, it would
-            # remove the lost_oid.
-            self.assertRaises(StorageError, db.pack, packt1)
-        else:
+        # BDBStorage allows the second pack, but doesn't lose data.
+        try:
             db.pack(packt1)
+        except StorageError:
+            pass
+        # This object would be removed by the second pack, even though
+        # it is reachable.
         self._storage.load(lost_oid, "")
 
     def checkPackUndoLog(self):