Merging in test suite changes from the bsddb3Storage-picklelog-branch.

lib/python/BDBStorage/tests/test_commitlog.py

@@ -207,7 +207,7 @@ class FullLogTest(BaseSetupTearDown):
         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 @@ class FullLogTest(BaseSetupTearDown):
         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

lib/python/BDBStorage/tests/test_storage_api.py

@@ -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
 

lib/python/BDBStorage/tests/test_zodb_simple.py

@@ -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