[Zodb-checkins] CVS: StandaloneZODB/bsddb3Storage/bsddb3Storage/tests - test_commitlog.py:1.10 test_storage_api.py:1.22 test_zodb_simple.py:1.8

[Barry Warsaw]

Update of /cvs-repository/StandaloneZODB/bsddb3Storage/bsddb3Storage/tests
In directory cvs.zope.org:/tmp/cvs-serv1799/bsddb3Storage/tests

Modified Files:
	test_commitlog.py test_storage_api.py test_zodb_simple.py 
Log Message:
Merging in test suite changes from the bsddb3Storage-picklelog-branch.


=== StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_commitlog.py 1.9 => 1.10 ===
--- StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_commitlog.py:1.9	Mon Feb 11 18:40:43 2002
+++ StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_commitlog.py	Fri Aug 23 13:16:12 2002
@@ -207,7 +207,7 @@
         rec = self._log.next()
         self.failUnless(rec)
         key, rec = rec
-        eq(key, 'o')
+        eq(key, 'x')
         eq(len(rec), 6)
         eq(rec, (oid, vid, nvrevid, '', pickle, prevrevid))
         eq(self._log.next(), None)
@@ -233,13 +233,13 @@
         key, rec = rec
         eq(key, 'o')
         eq(len(rec), 6)
-        eq(rec, (oid, zero, zero, lrevid, '', prevrevid))
+        eq(rec, (oid, zero, zero, lrevid, None, prevrevid))
         rec = self._log.next()
         unless(rec)
         key, rec = rec
         eq(key, 'o')
         eq(len(rec), 6)
-        eq(rec, (oid, vid, nvrevid, lrevid, '', prevrevid))
+        eq(rec, (oid, vid, nvrevid, lrevid, None, prevrevid))
         rec = self._log.next()
         unless(rec)
         key, rec = rec


=== StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_storage_api.py 1.21 => 1.22 ===
--- StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_storage_api.py:1.21	Tue Jul 16 10:51:31 2002
+++ StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_storage_api.py	Fri Aug 23 13:16:12 2002
@@ -15,6 +15,9 @@
 # Unit tests for basic storage functionality
 
 import unittest
+# Import this here and now so that import failures properly cause the test
+# suite to ignore these tests.
+import bsddb3
 
 from ZODB import POSException
 


=== StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_zodb_simple.py 1.7 => 1.8 ===
--- StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_zodb_simple.py:1.7	Mon Feb 11 18:40:43 2002
+++ StandaloneZODB/bsddb3Storage/bsddb3Storage/tests/test_zodb_simple.py	Fri Aug 23 13:16:12 2002
@@ -18,6 +18,9 @@
 
 import time
 import unittest
+# Import this here and now so that import failures properly cause the test
+# suite to ignore these tests.
+import bsddb3
 
 from ZODBTestBase import ZODBTestBase
 from Persistence import PersistentMapping