[Zodb-checkins] CVS: Zope3/src/zodb/storage/tests - basic.py:1.9 conflict.py:1.5 corruption.py:1.5 history.py:1.4 iterator.py:1.5 local.py:1.4 mt.py:1.7 packable.py:1.7 persistent.py:1.4 readonly.py:1.8 recovery.py:1.7 revision.py:1.7 synchronization.py:1.6 test_berkeley.py:1.2 test_file.py:1.10 test_mapping.py:1.4 test_virgin.py:1.4 test_whitebox.py:1.8 test_zodb_simple.py:1.4 undo.py:1.9 undoversion.py:1.5 version.py:1.7

Barry Warsaw barry@wooz.org
Thu, 20 Mar 2003 18:01:42 -0500


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

Modified Files:
	basic.py conflict.py corruption.py history.py iterator.py 
	local.py mt.py packable.py persistent.py readonly.py 
	recovery.py revision.py synchronization.py test_berkeley.py 
	test_file.py test_mapping.py test_virgin.py test_whitebox.py 
	test_zodb_simple.py undo.py undoversion.py version.py 
Log Message:
unittest really wants tests to be called testSomething and not
checkSomething.  Global rename.  Also fix all related makeSuite()
calls.

Also, in tests/mt.py we no-op do_loadSerial() if the storage doesn't
implement IUndoStorage interface.


=== Zope3/src/zodb/storage/tests/basic.py 1.8 => 1.9 ===
--- Zope3/src/zodb/storage/tests/basic.py:1.8	Thu Mar 13 16:32:29 2003
+++ Zope3/src/zodb/storage/tests/basic.py	Thu Mar 20 18:01:41 2003
@@ -33,22 +33,22 @@
 
 class BasicStorage:
 
-    def checkIStorage(self):
+    def testIStorage(self):
         self.assert_(IStorage.isImplementedBy(self._storage))
 
-    def checkDatabaseVersion(self):
+    def testDatabaseVersion(self):
         version = "abcd"
         self._storage.setVersion(version)
         self.assertEqual(version, self._storage.getVersion())
 
-    def checkDatabaseVersionPersistent(self):
+    def testDatabaseVersionPersistent(self):
         version = "abcd"
         self._storage.setVersion(version)
         self._storage.close()
         self.open()
         self.assertEqual(version, self._storage.getVersion())
 
-    def checkBasics(self):
+    def testBasics(self):
         t = Transaction()
         self._storage.tpcBegin(t)
         # This should simply return
@@ -79,7 +79,7 @@
                           0, 1, 2, 3, 4, Transaction())
         self._storage.tpcAbort(t)
 
-    def checkSerialIsNoneForInitialRevision(self):
+    def testSerialIsNoneForInitialRevision(self):
         eq = self.assertEqual
         oid = self._storage.newObjectId()
         txn = Transaction()
@@ -96,13 +96,13 @@
         eq(value, MinPO(11))
         eq(revid, newrevid)
 
-    def checkNonVersionStore(self, oid=None, revid=None, version=None):
+    def testNonVersionStore(self, oid=None, revid=None, version=None):
         revid = ZERO
         newrevid = self._dostore(revid=revid)
         # Finish the transaction.
         self.assertNotEqual(newrevid, revid)
 
-    def checkNonVersionStoreAndLoad(self):
+    def testNonVersionStoreAndLoad(self):
         eq = self.assertEqual
         oid = self._storage.newObjectId()
         self._dostore(oid=oid, data=MinPO(7))
@@ -116,12 +116,12 @@
         data, revid = self._storage.load(oid, '')
         eq(zodb_unpickle(data), MinPO(21))
 
-    def checkNonVersionModifiedInVersion(self):
+    def testNonVersionModifiedInVersion(self):
         oid = self._storage.newObjectId()
         self._dostore(oid=oid)
         self.assertEqual(self._storage.modifiedInVersion(oid), '')
 
-    def checkConflicts(self):
+    def testConflicts(self):
         oid = self._storage.newObjectId()
         revid1 = self._dostore(oid, data=MinPO(11))
         revid2 = self._dostore(oid, revid=revid1, data=MinPO(12))
@@ -129,7 +129,7 @@
                           self._dostore,
                           oid, revid=revid1, data=MinPO(13))
 
-    def checkWriteAfterAbort(self):
+    def testWriteAfterAbort(self):
         oid = self._storage.newObjectId()
         t = Transaction()
         self._storage.tpcBegin(t)
@@ -141,7 +141,7 @@
         oid = self._storage.newObjectId()
         self._dostore(oid=oid, data=MinPO(6))
 
-    def checkAbortAfterVote(self):
+    def testAbortAfterVote(self):
         oid1 = self._storage.newObjectId()
         revid1 = self._dostore(oid=oid1, data=MinPO(-2))
         oid = self._storage.newObjectId()
@@ -160,7 +160,7 @@
             data, _revid = self._storage.load(oid, '')
             self.assertEqual(revid, _revid)
 
-    def checkStoreTwoObjects(self):
+    def testStoreTwoObjects(self):
         noteq = self.assertNotEqual
         p31, p32, p51, p52 = map(MinPO, (31, 32, 51, 52))
         oid1 = self._storage.newObjectId()
@@ -173,7 +173,7 @@
         revid4 = self._dostore(oid2, revid=revid2, data=p52)
         noteq(revid3, revid4)
 
-    def checkGetSerial(self):
+    def testGetSerial(self):
         if not hasattr(self._storage, 'getSerial'):
             return
         eq = self.assertEqual
@@ -187,7 +187,7 @@
         revid2 = self._dostore(oid, revid=revid1, data=p42)
         eq(revid2, self._storage.getSerial(oid))
 
-    def checkTwoArgBegin(self):
+    def testTwoArgBegin(self):
         # XXX how standard is three-argument tpc_begin()?
         t = Transaction()
         tid = chr(42) * 8


=== Zope3/src/zodb/storage/tests/conflict.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/conflict.py:1.4	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/conflict.py	Thu Mar 20 18:01:41 2003
@@ -59,7 +59,7 @@
 
 
 class ConflictResolvingStorage:
-    def checkResolve(self):
+    def testResolve(self):
         obj = RPCounter()
         obj.inc()
 
@@ -82,7 +82,7 @@
     def unresolvable(self, klass):
         self.assert_(ResolveObjectReader.unresolvable(PCounter))
 
-    def checkUnresolvable1(self):
+    def testUnresolvable1(self):
         obj = PCounter()
         obj.inc()
 
@@ -101,7 +101,7 @@
                           oid, revid=revid1, data=zodb_pickle(obj))
         self.unresolvable(PCounter)
 
-    def checkUnresolvable2(self):
+    def testUnresolvable2(self):
         obj = PCounter2()
         obj.inc()
 
@@ -119,7 +119,7 @@
                           self._dostoreNP,
                           oid, revid=revid1, data=zodb_pickle(obj))
 
-    def checkBuggyResolve1(self):
+    def testBuggyResolve1(self):
         obj = PCounter3()
         obj.inc()
 
@@ -137,7 +137,7 @@
                           self._dostoreNP,
                           oid, revid=revid1, data=zodb_pickle(obj))
 
-    def checkBuggyResolve2(self):
+    def testBuggyResolve2(self):
         obj = PCounter4()
         obj.inc()
 
@@ -157,7 +157,7 @@
 
 class ConflictResolvingTransUndoStorage:
 
-    def checkUndoConflictResolution(self):
+    def testUndoConflictResolution(self):
         # This test is based on checkNotUndoable in the
         # TransactionalUndoStorage test suite.  Except here, conflict
         # resolution should allow us to undo the transaction anyway.
@@ -178,7 +178,7 @@
         self._storage.undo(tid, t)
         self._storage.tpcFinish(t)
 
-    def checkUndoUnresolvable(self):
+    def testUndoUnresolvable(self):
         # This test is based on checkNotUndoable in the
         # TransactionalUndoStorage test suite.  Except here, conflict
         # resolution should allow us to undo the transaction anyway.


=== Zope3/src/zodb/storage/tests/corruption.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/corruption.py:1.4	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/corruption.py	Thu Mar 20 18:01:41 2003
@@ -47,7 +47,7 @@
             data, s_revid = self._storage.load(oid, '')
             self.assertEqual(s_revid, revid)
 
-    def checkTruncatedIndex(self):
+    def testTruncatedIndex(self):
         oids = self._do_stores()
         self._close()
 
@@ -64,7 +64,7 @@
         self._storage = FileStorage(self.path)
         self._check_stores(oids)
 
-    def checkCorruptedIndex(self):
+    def testCorruptedIndex(self):
         oids = self._do_stores()
         self._close()
 


=== Zope3/src/zodb/storage/tests/history.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/history.py:1.3	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/history.py	Thu Mar 20 18:01:41 2003
@@ -24,7 +24,7 @@
 
 
 class HistoryStorage:
-    def checkSimpleHistory(self):
+    def testSimpleHistory(self):
         eq = self.assertEqual
         # Store a couple of non-version revisions of the object
         oid = self._storage.newObjectId()
@@ -71,7 +71,7 @@
         eq(d['serial'], revid1)
         eq(d['version'], '')
 
-    def checkVersionHistory(self):
+    def testVersionHistory(self):
         eq = self.assertEqual
         # Store a couple of non-version revisions
         oid = self._storage.newObjectId()
@@ -109,7 +109,7 @@
         eq(d['serial'], revid1)
         eq(d['version'], '')
 
-    def checkHistoryAfterVersionCommit(self):
+    def testHistoryAfterVersionCommit(self):
         eq = self.assertEqual
         # Store a couple of non-version revisions
         oid = self._storage.newObjectId()
@@ -167,7 +167,7 @@
         eq(d['serial'], revid1)
         eq(d['version'], '')
 
-    def checkHistoryAfterVersionAbort(self):
+    def testHistoryAfterVersionAbort(self):
         eq = self.assertEqual
         # Store a couple of non-version revisions
         oid = self._storage.newObjectId()


=== Zope3/src/zodb/storage/tests/iterator.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/iterator.py:1.4	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/iterator.py	Thu Mar 20 18:01:41 2003
@@ -40,7 +40,7 @@
         eq(val, val0 + len(revids))
 
 class IteratorStorage(IteratorCompare):
-    def checkSimpleIteration(self):
+    def testSimpleIteration(self):
         # Store a bunch of revisions of a single object
         self._oid = oid = self._storage.newObjectId()
         revid1 = self._dostore(oid, data=MinPO(11))
@@ -51,14 +51,14 @@
         self.iter_verify(txniter, [revid1, revid2, revid3], 11)
         txniter.close()
 
-    def checkClose(self):
+    def testClose(self):
         self._oid = oid = self._storage.newObjectId()
         revid1 = self._dostore(oid, data=MinPO(11))
         txniter = self._storage.iterator()
         txniter.close()
         self.assertRaises(IOError, iter(txniter).next)
 
-    def checkVersionIterator(self):
+    def testVersionIterator(self):
         if not IUndoStorage.isImplementedBy(self._storage):
             return
         self._dostore()
@@ -85,7 +85,7 @@
             for data in trans:
                 pass
 
-    def checkUndoZombieNonVersion(self):
+    def testUndoZombieNonVersion(self):
         if not IUndoStorage.isImplementedBy(self._storage):
             return
 
@@ -113,7 +113,7 @@
         self.assertEqual(rec.oid, oid)
         self.assertEqual(rec.data, None)
 
-    def checkTransactionExtensionFromIterator(self):
+    def testTransactionExtensionFromIterator(self):
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=MinPO(1))
         iter = self._storage.iterator()
@@ -126,7 +126,7 @@
 
 class ExtendedIteratorStorage(IteratorCompare):
 
-    def checkExtendedIteration(self):
+    def testExtendedIteration(self):
         # Store a bunch of revisions of a single object
         self._oid = oid = self._storage.newObjectId()
         revid1 = self._dostore(oid, data=MinPO(11))


=== Zope3/src/zodb/storage/tests/local.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/local.py:1.3	Wed Jan 22 15:12:29 2003
+++ Zope3/src/zodb/storage/tests/local.py	Thu Mar 20 18:01:41 2003
@@ -18,7 +18,7 @@
     A local storage is one that doens't use ZEO. The __len__()
     implementation for ZEO is inexact.
     """
-    def checkLen(self):
+    def testLen(self):
         eq = self.assertEqual
         # The length of the database ought to grow by one each time
         eq(len(self._storage), 0)


=== Zope3/src/zodb/storage/tests/mt.py 1.6 => 1.7 ===
--- Zope3/src/zodb/storage/tests/mt.py:1.6	Thu Mar 13 16:32:29 2003
+++ Zope3/src/zodb/storage/tests/mt.py	Thu Mar 20 18:01:41 2003
@@ -26,6 +26,7 @@
      import StorageTestBase, zodb_pickle, zodb_unpickle, handle_serials
 from zodb.storage.tests.minpo import MinPO
 from zodb.interfaces import ConflictError
+from zodb.storage.interfaces import IUndoStorage
 
 SHORT_DELAY = 0.01
 
@@ -189,6 +190,9 @@
         self.storage.load(oid, '')
 
     def do_loadSerial(self):
+        # Skip this test on storages that do not implement IUndoStorage
+        if not IUndoStorage.isImplementedBy(self.storage):
+            return
         oid = self.pick_oid()
         self.storage.loadSerial(oid, self.oids[oid])
 
@@ -222,19 +226,19 @@
         for t in threads:
             self.failIf(t.isAlive(), "thread failed to finish in 60 seconds")
 
-    def check2ZODBThreads(self):
+    def test2ZODBThreads(self):
         db = zodb.db.DB(self._storage)
         self._checkNThreads(2, ZODBClientThread, db, self)
 
-    def check7ZODBThreads(self):
+    def test7ZODBThreads(self):
         db = zodb.db.DB(self._storage)
         self._checkNThreads(7, ZODBClientThread, db, self)
 
-    def check2StorageThreads(self):
+    def test2StorageThreads(self):
         self._checkNThreads(2, StorageClientThread, self._storage, self)
 
-    def check7StorageThreads(self):
+    def test7StorageThreads(self):
         self._checkNThreads(7, StorageClientThread, self._storage, self)
 
-    def check4ExtStorageThread(self):
+    def test4ExtStorageThread(self):
         self._checkNThreads(4, ExtStorageClientThread, self._storage, self)


=== Zope3/src/zodb/storage/tests/packable.py 1.6 => 1.7 ===
--- Zope3/src/zodb/storage/tests/packable.py:1.6	Fri Mar 14 12:55:26 2003
+++ Zope3/src/zodb/storage/tests/packable.py	Thu Mar 20 18:01:41 2003
@@ -28,18 +28,18 @@
 
 
 class PackableStorage:
-    def checkPackEmptyStorage(self):
+    def testPackEmptyStorage(self):
         self._storage.pack(time.time())
 
-    def checkPackTomorrow(self):
+    def testPackTomorrow(self):
         self._initroot()
         self._storage.pack(time.time() + 100000)
 
-    def checkPackYesterday(self):
+    def testPackYesterday(self):
         self._initroot()
         self._storage.pack(time.time() - 100000)
 
-    def checkPackAllRevisions(self):
+    def testPackAllRevisions(self):
         self._initroot()
         eq = self.assertEqual
         raises = self.assertRaises
@@ -72,7 +72,7 @@
         raises(KeyError, self._storage.loadSerial, oid, revid2)
         raises(KeyError, self._storage.loadSerial, oid, revid3)
 
-    def checkPackJustOldRevisions(self):
+    def testPackJustOldRevisions(self):
         eq = self.assertEqual
         raises = self.assertRaises
         # Create a root object
@@ -119,7 +119,7 @@
         pobj = zodb_unpickle(data)
         eq(pobj.value, 3)
 
-    def checkPackOnlyOneObject(self):
+    def testPackOnlyOneObject(self):
         eq = self.assertEqual
         raises = self.assertRaises
         # Create a root object.
@@ -198,7 +198,7 @@
         pobj = zodb_unpickle(data)
         eq(pobj.value, 11)
 
-    def checkPackUnlinkedFromRoot(self):
+    def testPackUnlinkedFromRoot(self):
         eq = self.assertEqual
         db = DB(self._storage)
         conn = db.open()


=== Zope3/src/zodb/storage/tests/persistent.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/persistent.py:1.3	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/persistent.py	Thu Mar 20 18:01:41 2003
@@ -15,7 +15,7 @@
 
 class PersistentStorage:
 
-    def checkUpdatesPersist(self):
+    def testUpdatesPersist(self):
         oids = []
 
         def new_oid_wrapper(l=oids, newObjectId=self._storage.newObjectId):


=== Zope3/src/zodb/storage/tests/readonly.py 1.7 => 1.8 ===
--- Zope3/src/zodb/storage/tests/readonly.py:1.7	Mon Mar 17 14:48:51 2003
+++ Zope3/src/zodb/storage/tests/readonly.py	Thu Mar 20 18:01:41 2003
@@ -31,7 +31,7 @@
         self.open(read_only=True)
         self.failUnless(self._storage.isReadOnly())
 
-    def checkReadMethods(self):
+    def testReadMethods(self):
         eq = self.assertEqual
         unless = self.failUnless
         self._create_data()
@@ -45,7 +45,7 @@
                 _data = self._storage.loadSerial(oid, revid)
                 eq(data, _data)
 
-    def checkWriteMethods(self):
+    def testWriteMethods(self):
         raises = self.assertRaises
         self._make_readonly()
         t = Transaction()


=== Zope3/src/zodb/storage/tests/recovery.py 1.6 => 1.7 ===
--- Zope3/src/zodb/storage/tests/recovery.py:1.6	Fri Mar 14 12:55:26 2003
+++ Zope3/src/zodb/storage/tests/recovery.py	Thu Mar 20 18:01:41 2003
@@ -28,7 +28,7 @@
 
 class RecoveryStorage(IteratorDeepCompare):
     # Requires a setUp() that creates a self._dst destination storage
-    def checkSimpleRecovery(self):
+    def testSimpleRecovery(self):
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=11)
         revid = self._dostore(oid, revid=revid, data=12)
@@ -36,7 +36,7 @@
         self._dst.copyTransactionsFrom(self._storage)
         self.compare(self._storage, self._dst)
 
-    def checkRecoveryAcrossVersions(self):
+    def testRecoveryAcrossVersions(self):
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=21)
         revid = self._dostore(oid, revid=revid, data=22)
@@ -51,7 +51,7 @@
         self._dst.copyTransactionsFrom(self._storage)
         self.compare(self._storage, self._dst)
 
-    def checkRecoverAbortVersion(self):
+    def testRecoverAbortVersion(self):
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=21, version="one")
         revid = self._dostore(oid, revid=revid, data=23, version='one')
@@ -79,7 +79,7 @@
             self.assertEqual(data.data, None)
             siter.close()
 
-    def checkRecoverUndoInVersion(self):
+    def testRecoverUndoInVersion(self):
 
         def checkObj(oid, version, v_data, nv_data):
             # Cause test to fail if object oid has wrong data.
@@ -138,7 +138,7 @@
         self._dst.copyTransactionsFrom(self._storage)
         self.compare(self._storage, self._dst)
 
-    def checkRestoreAcrossPack(self):
+    def testRestoreAcrossPack(self):
         eq = self.assertEqual
         db = DB(self._storage)
         c = db.open()
@@ -172,7 +172,7 @@
         eq(data, None)
         eq(refs, None)
 
-    def checkPackWithGCOnDestinationAfterRestore(self):
+    def testPackWithGCOnDestinationAfterRestore(self):
         raises = self.assertRaises
         db = DB(self._storage)
         conn = db.open()


=== Zope3/src/zodb/storage/tests/revision.py 1.6 => 1.7 ===
--- Zope3/src/zodb/storage/tests/revision.py:1.6	Thu Mar 13 16:32:29 2003
+++ Zope3/src/zodb/storage/tests/revision.py	Thu Mar 20 18:01:41 2003
@@ -21,7 +21,7 @@
 
 class RevisionStorage:
 
-    def checkLoadSerial(self):
+    def testLoadSerial(self):
         oid = self._storage.newObjectId()
         revid = ZERO
         revisions = {}


=== Zope3/src/zodb/storage/tests/synchronization.py 1.5 => 1.6 ===
--- Zope3/src/zodb/storage/tests/synchronization.py:1.5	Thu Mar 13 16:32:29 2003
+++ Zope3/src/zodb/storage/tests/synchronization.py	Thu Mar 20 18:01:41 2003
@@ -84,59 +84,59 @@
         self.assertRaises(StorageTransactionError, callable, *args)
         self._storage.tpcAbort(t)
 
-    def checkAbortVersionNotCommitting(self):
+    def testAbortVersionNotCommitting(self):
         self.verifyNotCommitting(self._storage.abortVersion,
                                  VERSION, Transaction())
 
-    def checkAbortVersionWrongTrans(self):
+    def testAbortVersionWrongTrans(self):
         self.verifyWrongTrans(self._storage.abortVersion,
                               VERSION, Transaction())
 
-    def checkCommitVersionNotCommitting(self):
+    def testCommitVersionNotCommitting(self):
         self.verifyNotCommitting(self._storage.commitVersion,
                                  VERSION, "", Transaction())
 
-    def checkCommitVersionWrongTrans(self):
+    def testCommitVersionWrongTrans(self):
         self.verifyWrongTrans(self._storage.commitVersion,
                               VERSION, "", Transaction())
 
 
-    def checkStoreNotCommitting(self):
+    def testStoreNotCommitting(self):
         self.verifyNotCommitting(self._storage.store,
                                  OID, SERIALNO, "", "", "", Transaction())
 
-    def checkStoreWrongTrans(self):
+    def testStoreWrongTrans(self):
         self.verifyWrongTrans(self._storage.store,
                               OID, SERIALNO, "", "", "", Transaction())
 
-##    def checkNewOidNotCommitting(self):
+##    def testNewOidNotCommitting(self):
 ##        self.verifyNotCommitting(self._storage.new_oid)
 
-##    def checkNewOidWrongTrans(self):
+##    def testNewOidWrongTrans(self):
 ##        self.verifyWrongTrans(self._storage.new_oid)
 
 
-    def checkAbortNotCommitting(self):
+    def testAbortNotCommitting(self):
         self._storage.tpcAbort(Transaction())
 
-    def checkAbortWrongTrans(self):
+    def testAbortWrongTrans(self):
         t = Transaction()
         self._storage.tpcBegin(t)
         self._storage.tpcAbort(Transaction())
         self._storage.tpcAbort(t)
 
-    def checkFinishNotCommitting(self):
+    def testFinishNotCommitting(self):
         t = Transaction()
         self._storage.tpcFinish(t)
         self._storage.tpcAbort(t)
 
-    def checkFinishWrongTrans(self):
+    def testFinishWrongTrans(self):
         t = Transaction()
         self._storage.tpcBegin(t)
         self._storage.tpcFinish(Transaction())
         self._storage.tpcAbort(t)
 
-    def checkBeginCommitting(self):
+    def testBeginCommitting(self):
         t = Transaction()
         self._storage.tpcBegin(t)
         self._storage.tpcBegin(t)


=== Zope3/src/zodb/storage/tests/test_berkeley.py 1.1 => 1.2 ===
--- Zope3/src/zodb/storage/tests/test_berkeley.py:1.1	Fri Mar 14 16:10:14 2003
+++ Zope3/src/zodb/storage/tests/test_berkeley.py	Thu Mar 20 18:01:41 2003
@@ -35,7 +35,7 @@
 
 
 class MinimalTest(bdbmixin.MinimalTestBase, BasicStorage, SynchronizedStorage):
-    def checkVersionedStoreAndLoad(self):
+    def testVersionedStoreAndLoad(self):
         # This storage doesn't support versions, so we should get an exception
         oid = self._storage.newObjectId()
         self.assertRaises(NotImplementedError,
@@ -78,9 +78,9 @@
 def test_suite():
     suite = unittest.TestSuite()
     if berkeley_is_available:
-        suite.addTest(unittest.makeSuite(FullTest, 'check'))
-        suite.addTest(unittest.makeSuite(FullRecoveryTest, 'check'))
-        suite.addTest(unittest.makeSuite(MinimalTest, 'check'))
+        suite.addTest(unittest.makeSuite(FullTest))
+        suite.addTest(unittest.makeSuite(FullRecoveryTest))
+        suite.addTest(unittest.makeSuite(MinimalTest))
     return suite
 
 


=== Zope3/src/zodb/storage/tests/test_file.py 1.9 => 1.10 ===
--- Zope3/src/zodb/storage/tests/test_file.py:1.9	Fri Mar 14 14:41:17 2003
+++ Zope3/src/zodb/storage/tests/test_file.py	Thu Mar 20 18:01:41 2003
@@ -77,7 +77,7 @@
         L1.sort(); L2.sort()
         self.assertEqual(L1, L2)
 
-    def checkLongMetadata(self):
+    def testLongMetadata(self):
         s = "X" * 75000
         try:
             self._dostore(user=s)
@@ -108,9 +108,8 @@
         return zodb.storage.file.FileStorage('Dest.fs')
 
 def test_suite():
-    suite = unittest.makeSuite(FileStorageTests, 'check')
-    suite2 = unittest.makeSuite(corruption.FileStorageCorruptTests, 'check')
-    suite3 = unittest.makeSuite(FileStorageRecoveryTest, 'check')
-    suite.addTest(suite2)
-    suite.addTest(suite3)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(FileStorageTests))
+    suite.addTest(unittest.makeSuite(corruption.FileStorageCorruptTests))
+    suite.addTest(unittest.makeSuite(FileStorageRecoveryTest))
     return suite


=== Zope3/src/zodb/storage/tests/test_mapping.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/test_mapping.py:1.3	Fri Jan 24 18:20:51 2003
+++ Zope3/src/zodb/storage/tests/test_mapping.py	Thu Mar 20 18:01:41 2003
@@ -27,15 +27,17 @@
     def tearDown(self):
         self._storage.close()
 
-    def checkDatabaseVersionPersistent(self):
+    def testDatabaseVersionPersistent(self):
         # This can't possibly work
         pass
 
+
 def test_suite():
-    suite = unittest.makeSuite(MappingStorageTests, 'check')
+    suite = unittest.makeSuite(MappingStorageTests)
     return suite
 
-if __name__ == "__main__":
-    loader = unittest.TestLoader()
-    loader.testMethodPrefix = "check"
-    unittest.main(testLoader=loader)
+
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')


=== Zope3/src/zodb/storage/tests/test_virgin.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/test_virgin.py:1.3	Wed Jan 22 15:55:53 2003
+++ Zope3/src/zodb/storage/tests/test_virgin.py	Thu Mar 20 18:01:41 2003
@@ -25,10 +25,10 @@
 
 
 class InsertMixin:
-    def checkIsEmpty(self):
+    def testIsEmpty(self):
         self.failUnless(not self._root.has_key('names'))
 
-    def checkNewInserts(self):
+    def testNewInserts(self):
         self._root['names'] = names = PersistentDict()
         names['Warsaw'] = 'Barry'
         names['Hylton'] = 'Jeremy'
@@ -50,8 +50,8 @@
 def test_suite():
     suite = unittest.TestSuite()
     if berkeley_is_available:
-        suite.addTest(unittest.makeSuite(MinimalNewInsertsTest, 'check'))
-        suite.addTest(unittest.makeSuite(FullNewInsertsTest, 'check'))
+        suite.addTest(unittest.makeSuite(MinimalNewInsertsTest))
+        suite.addTest(unittest.makeSuite(FullNewInsertsTest))
     return suite
 
 


=== Zope3/src/zodb/storage/tests/test_whitebox.py 1.7 => 1.8 ===
--- Zope3/src/zodb/storage/tests/test_whitebox.py:1.7	Wed Feb  5 18:28:27 2003
+++ Zope3/src/zodb/storage/tests/test_whitebox.py	Thu Mar 20 18:01:41 2003
@@ -37,7 +37,7 @@
 class WhiteboxLowLevelMinimal(BerkeleyTestBase):
     ConcreteStorage = BDBMinimalStorage
 
-    def checkTableConsistencyAfterCommit(self):
+    def testTableConsistencyAfterCommit(self):
         unless = self.failIf
         eq = self.assertEqual
         oid = self._storage.newObjectId()
@@ -76,7 +76,7 @@
         # stored object isn't referenced by any other objects.
         eq(len(self._storage._refcounts.keys()), 0)
 
-    def checkStorageVersionAfterCreation(self):
+    def testStorageVersionAfterCreation(self):
         from zodb.storage.bdbminimal import BDBMINIMAL_SCHEMA_VERSION
         eq = self.assertEqual
         eq(self._storage._info['version'], BDBMINIMAL_SCHEMA_VERSION)
@@ -89,7 +89,7 @@
 class WhiteboxHighLevelMinimal(ZODBTestBase):
     ConcreteStorage = BDBMinimalStorage
 
-    def checkReferenceCounting(self):
+    def testReferenceCounting(self):
         eq = self.assertEqual
         obj = MinPO(11)
         self._root.obj = obj
@@ -129,7 +129,7 @@
         eq(len(self._storage._oids.keys()), 0)
         eq(len(self._storage._pending.keys()), 0)
 
-    def checkRecursiveReferenceCounting(self):
+    def testRecursiveReferenceCounting(self):
         eq = self.assertEqual
         obj1 = Object()
         obj2 = Object()
@@ -176,7 +176,7 @@
 class WhiteboxLowLevelFull(BerkeleyTestBase):
     ConcreteStorage = BDBFullStorage
 
-    def checkStorageVersionAfterCreation(self):
+    def testStorageVersionAfterCreation(self):
         from zodb.storage.bdbminimal import BDBMINIMAL_SCHEMA_VERSION
         eq = self.assertEqual
         eq(self._storage._info['version'], BDBMINIMAL_SCHEMA_VERSION)
@@ -189,7 +189,7 @@
 class WhiteboxHighLevelFull(ZODBTestBase):
     ConcreteStorage = BDBFullStorage
 
-    def checkReferenceCounting(self):
+    def testReferenceCounting(self):
         eq = self.assertEqual
         # Make sure the databases have what we expect
         eq(len(self._storage._serials.items()), 1)
@@ -239,9 +239,9 @@
 def test_suite():
     suite = unittest.TestSuite()
     if berkeley_is_available:
-        suite.addTest(unittest.makeSuite(WhiteboxLowLevelMinimal, 'check'))
-        suite.addTest(unittest.makeSuite(WhiteboxHighLevelMinimal, 'check'))
-        suite.addTest(unittest.makeSuite(WhiteboxHighLevelFull, 'check'))
+        suite.addTest(unittest.makeSuite(WhiteboxLowLevelMinimal))
+        suite.addTest(unittest.makeSuite(WhiteboxHighLevelMinimal))
+        suite.addTest(unittest.makeSuite(WhiteboxHighLevelFull))
     return suite
 
 


=== Zope3/src/zodb/storage/tests/test_zodb_simple.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/tests/test_zodb_simple.py:1.3	Wed Jan 22 15:58:31 2003
+++ Zope3/src/zodb/storage/tests/test_zodb_simple.py	Thu Mar 20 18:01:41 2003
@@ -28,34 +28,34 @@
 
 
 class CommitAndRead:
-    def checkCommit(self):
+    def testCommit(self):
         self.failUnless(not self._root)
         names = self._root['names'] = PersistentDict()
         names['Warsaw'] = 'Barry'
         names['Hylton'] = 'Jeremy'
         get_transaction().commit()
 
-    def checkReadAfterCommit(self):
+    def testReadAfterCommit(self):
         eq = self.assertEqual
-        self.checkCommit()
+        self.testCommit()
         names = self._root['names']
         eq(names['Warsaw'], 'Barry')
         eq(names['Hylton'], 'Jeremy')
         self.failUnless(names.get('Drake') is None)
 
-    def checkAbortAfterRead(self):
-        self.checkReadAfterCommit()
+    def testAbortAfterRead(self):
+        self.testReadAfterCommit()
         names = self._root['names']
         names['Drake'] = 'Fred'
         get_transaction().abort()
 
-    def checkReadAfterAbort(self):
-        self.checkAbortAfterRead()
+    def testReadAfterAbort(self):
+        self.testAbortAfterRead()
         names = self._root['names']
         self.failUnless(names.get('Drake') is None)
 
-    def checkChangingCommits(self):
-        self.checkReadAfterAbort()
+    def testChangingCommits(self):
+        self.testReadAfterAbort()
         now = time.time()
         # Make sure the last timestamp was more than 3 seconds ago
         timestamp = self._root.get('timestamp')
@@ -82,8 +82,8 @@
 def test_suite():
     suite = unittest.TestSuite()
     if berkeley_is_available:
-        suite.addTest(unittest.makeSuite(MinimalCommitAndRead, 'check'))
-        suite.addTest(unittest.makeSuite(FullCommitAndRead, 'check'))
+        suite.addTest(unittest.makeSuite(MinimalCommitAndRead))
+        suite.addTest(unittest.makeSuite(FullCommitAndRead))
     return suite
 
 


=== Zope3/src/zodb/storage/tests/undo.py 1.8 => 1.9 ===
--- Zope3/src/zodb/storage/tests/undo.py:1.8	Fri Mar 14 12:55:26 2003
+++ Zope3/src/zodb/storage/tests/undo.py	Thu Mar 20 18:01:41 2003
@@ -71,7 +71,7 @@
             for rec in txn:
                 pass
 
-    def checkSimpleTransactionalUndo(self):
+    def testSimpleTransactionalUndo(self):
         eq = self.assertEqual
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=MinPO(23))
@@ -133,7 +133,7 @@
         eq(zodb_unpickle(data), MinPO(23))
         self._iterate()
 
-    def checkUndoCreationBranch1(self):
+    def testUndoCreationBranch1(self):
         eq = self.assertEqual
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=MinPO(11))
@@ -164,7 +164,7 @@
         self.assertRaises(KeyError, self._storage.load, oid, '')
         self._iterate()
 
-    def checkUndoCreationBranch2(self):
+    def testUndoCreationBranch2(self):
         eq = self.assertEqual
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=MinPO(11))
@@ -196,7 +196,7 @@
         eq(zodb_unpickle(data), MinPO(12))
         self._iterate()
 
-    def checkTwoObjectUndo(self):
+    def testTwoObjectUndo(self):
         eq = self.assertEqual
         # Convenience
         p31, p32, p51, p52 = [zodb_pickle(MinPO(i)) for i in (31, 32, 51, 52)]
@@ -249,7 +249,7 @@
         eq(zodb_unpickle(data), MinPO(51))
         self._iterate()
 
-    def checkTwoObjectUndoAtOnce(self):
+    def testTwoObjectUndoAtOnce(self):
         # Convenience
         eq = self.assertEqual
         unless = self.failUnless
@@ -318,7 +318,7 @@
         eq(zodb_unpickle(data), MinPO(52))
         self._iterate()
 
-    def checkTwoObjectUndoAgain(self):
+    def testTwoObjectUndoAgain(self):
         eq = self.assertEqual
         p31, p32, p33, p51, p52, p53 = [zodb_pickle(MinPO(i))
                                         for i in (31, 32, 33, 51, 52, 53)]
@@ -389,7 +389,7 @@
         self._iterate()
 
 
-    def checkNotUndoable(self):
+    def testNotUndoable(self):
         eq = self.assertEqual
         # Set things up so we've got a transaction that can't be undone
         oid = self._storage.newObjectId()
@@ -444,7 +444,7 @@
         self._storage.tpcAbort(t)
         self._iterate()
 
-    def checkTransactionalUndoAfterPack(self):
+    def testTransactionalUndoAfterPack(self):
         eq = self.assertEqual
         # Add a few object revisions
         self._initroot()
@@ -484,7 +484,7 @@
         eq(zodb_unpickle(data), MinPO(52))
         self._iterate()
 
-    def checkTransactionalUndoAfterPackWithObjectUnlinkFromRoot(self):
+    def testTransactionalUndoAfterPackWithObjectUnlinkFromRoot(self):
         eq = self.assertEqual
         db = DB(self._storage)
         conn = db.open()
@@ -540,7 +540,7 @@
         eq(o1.obj.obj, o3)
         self._iterate()
 
-    def checkTransactionalUndoIterator(self):
+    def testTransactionalUndoIterator(self):
         # check that data_txn set in iterator makes sense
         if not hasattr(self._storage, "iterator"):
             return


=== Zope3/src/zodb/storage/tests/undoversion.py 1.4 => 1.5 ===
--- Zope3/src/zodb/storage/tests/undoversion.py:1.4	Thu Mar 13 16:32:29 2003
+++ Zope3/src/zodb/storage/tests/undoversion.py	Thu Mar 20 18:01:41 2003
@@ -20,7 +20,7 @@
 
 
 class TransactionalUndoVersionStorage:
-    def checkUndoInVersion(self):
+    def testUndoInVersion(self):
         oid = self._storage.newObjectId()
         version = 'one'
         revid_a = self._dostore(oid, data=MinPO(91))


=== Zope3/src/zodb/storage/tests/version.py 1.6 => 1.7 ===
--- Zope3/src/zodb/storage/tests/version.py:1.6	Fri Mar 14 15:01:53 2003
+++ Zope3/src/zodb/storage/tests/version.py	Thu Mar 20 18:01:41 2003
@@ -30,10 +30,10 @@
 
 class VersionStorage:
 
-    def checkIVersionStorage(self):
+    def testIVersionStorage(self):
         self.assert_(IVersionStorage.isImplementedBy(self._storage))
 
-    def checkVersionedStoreAndLoad(self):
+    def testVersionedStoreAndLoad(self):
         eq = self.assertEqual
         # Store a couple of non-version revisions of the object
         oid = self._storage.newObjectId()
@@ -57,7 +57,7 @@
             s = self._storage.getSerial(oid)
             eq(s, max(revid, vrevid))
 
-    def checkVersionedLoadErrors(self):
+    def testVersionedLoadErrors(self):
         oid = self._storage.newObjectId()
         version = 'test-version'
         revid = self._dostore(oid, data=MinPO(11))
@@ -71,7 +71,7 @@
         self.assertEqual(zodb_unpickle(data), MinPO(11))
 
 
-    def checkVersionLock(self):
+    def testVersionLock(self):
         oid = self._storage.newObjectId()
         revid = self._dostore(oid, data=MinPO(11))
         version = 'test-version'
@@ -82,7 +82,7 @@
                           oid, revid=revid, data=MinPO(14),
                           version='another-version')
 
-    def checkVersionEmpty(self):
+    def testVersionEmpty(self):
         # Before we store anything, these versions ought to be empty
         version = 'test-version'
         self.failUnless(self._storage.versionEmpty(version))
@@ -101,7 +101,7 @@
         # But this non-existant version should be empty
         self.failUnless(self._storage.versionEmpty('bogus'))
 
-    def checkVersions(self):
+    def testVersions(self):
         unless = self.failUnless
         # Store some objects in the non-version
         oid1 = self._storage.newObjectId()
@@ -138,7 +138,7 @@
                               version=version)
         return oid, version
 
-    def checkAbortVersion(self):
+    def testAbortVersion(self):
         eq = self.assertEqual
         oid, version = self._setup_version()
 
@@ -161,7 +161,7 @@
         data, revid = self._storage.load(oid, '')
         eq(zodb_unpickle(data), MinPO(51))
 
-    def checkAbortVersionErrors(self):
+    def testAbortVersionErrors(self):
         eq = self.assertEqual
         oid, version = self._setup_version()
         # Now abort a bogus version
@@ -183,7 +183,7 @@
         data, revid = self._storage.load(oid, '')
         eq(zodb_unpickle(data), MinPO(51))
 
-    def checkCommitVersionErrors(self):
+    def testCommitVersionErrors(self):
         if not (hasattr(self._storage, 'supportsTransactionalUndo')
             and self._storage.supportsTransactionalUndo()):
             # XXX FileStorage used to be broken on this one
@@ -201,7 +201,7 @@
         finally:
             self._storage.tpcAbort(t)
 
-    def checkModifyAfterAbortVersion(self):
+    def testModifyAfterAbortVersion(self):
         eq = self.assertEqual
         oid, version = self._setup_version()
         # Now abort the version
@@ -220,7 +220,7 @@
         eq(newrevid, revid)
         eq(zodb_unpickle(data), MinPO(54))
 
-    def checkCommitToNonVersion(self):
+    def testCommitToNonVersion(self):
         eq = self.assertEqual
         oid, version = self._setup_version()
         data, revid = self._storage.load(oid, version)
@@ -232,7 +232,7 @@
         data, revid = self._storage.load(oid, '')
         eq(zodb_unpickle(data), MinPO(54))
 
-    def checkCommitToOtherVersion(self):
+    def testCommitToOtherVersion(self):
         eq = self.assertEqual
         oid1, version1 = self._setup_version('one')
 
@@ -268,7 +268,7 @@
         data, revid2 = self._storage.load(oid1, 'bela lugosi')
         eq(zodb_unpickle(data), MinPO(51))
 
-    def checkAbortOneVersionCommitTheOther(self):
+    def testAbortOneVersionCommitTheOther(self):
         eq = self.assertEqual
         oid1, version1 = self._setup_version('one')
         data, revid1 = self._storage.load(oid1, version1)
@@ -310,7 +310,7 @@
         self.assertRaises(KeyError,
                           self._storage.load, oid, 'two')
 
-    def checkPackVersions(self):
+    def testPackVersions(self):
         db = DB(self._storage)
         cn = db.open(version="testversion")
         root = cn.root()