[Zope3-checkins] CVS: Zope3/src/zodb/storage/tests - readonly.py:1.5 revision.py:1.5

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb/storage/tests
In directory cvs.zope.org:/tmp/cvs-serv23205/src/zodb/storage/tests

Modified Files:
	readonly.py revision.py 
Log Message:
Merge the ZODB3-2-integration branch to the trunk.

The primary changes here are to port the many new ZEO features from
ZODB 3.2.  There are also many changes to the test suite.

python2.2 tells me: Ran 3755 tests in 560.277s


=== Zope3/src/zodb/storage/tests/readonly.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/readonly.py:1.4	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/readonly.py	Tue Feb 25 13:55:03 2003
@@ -38,8 +38,9 @@
             data, revid = self._storage.load(oid, '')
             self.assertEqual(revid, self.oids[oid])
             self.assert_(not self._storage.modifiedInVersion(oid))
-            _data = self._storage.loadSerial(oid, revid)
-            self.assertEqual(data, _data)
+            if IUndoStorage.isImplementedBy(self._storage):
+                _data = self._storage.loadSerial(oid, revid)
+                self.assertEqual(data, _data)
 
     def checkWriteMethods(self):
         self._make_readonly()


=== Zope3/src/zodb/storage/tests/revision.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/revision.py:1.4	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/revision.py	Tue Feb 25 13:55:03 2003
@@ -19,7 +19,6 @@
 from zodb.storage.tests.minpo import MinPO
 from zodb.storage.tests.base import zodb_unpickle, zodb_pickle
 
-
 class RevisionStorage:
 
     def checkLoadSerial(self):