[Zodb-checkins] CVS: ZODB3/BDBStorage/tests - BerkeleyTestBase.py:1.12 ZODBTestBase.py:1.7 test_autopack.py:1.5 test_create.py:1.15 test_virgin.py:1.11 test_whitebox.py:1.3 test_zodb_simple.py:1.9 timeiter.py:1.4 timepickles.py:1.3
Barry Warsaw
barry@wooz.org
Wed, 18 Dec 2002 17:15:34 -0500
Update of /cvs-repository/ZODB3/BDBStorage/tests
In directory cvs.zope.org:/tmp/cvs-serv15273/BDBStorage/tests
Modified Files:
BerkeleyTestBase.py ZODBTestBase.py test_autopack.py
test_create.py test_virgin.py test_whitebox.py
test_zodb_simple.py timeiter.py timepickles.py
Log Message:
For alignment with ZODB4, renaming these storages for ZODB3 3.2.
bsddb3Storage becomes BDBStorage
Full becomes BDBFullStorage
Minimal becomes BDBMinimalStorage
Removing MinimalReplicated.py, Packless.py, and base.py
=== ZODB3/BDBStorage/tests/BerkeleyTestBase.py 1.11 => 1.12 ===
--- ZODB3/BDBStorage/tests/BerkeleyTestBase.py:1.11 Tue Nov 19 15:39:15 2002
+++ ZODB3/BDBStorage/tests/BerkeleyTestBase.py Wed Dec 18 17:15:03 2002
@@ -12,12 +12,13 @@
#
##############################################################################
-# Basic test framework class for both the Full and Minimal Berkeley storages
+# Basic test framework class for both the BDBFullStorage and BDBMinimalStorage
+# Berkeley storages
import os
import errno
-from bsddb3Storage.BerkeleyBase import BerkeleyConfig
+from BDBStorage.BerkeleyBase import BerkeleyConfig
from ZODB.tests.StorageTestBase import StorageTestBase
DBHOME = 'test-db'
@@ -63,10 +64,10 @@
class MinimalTestBase(BerkeleyTestBase):
- from bsddb3Storage import Minimal
- ConcreteStorage = Minimal.Minimal
+ from BDBStorage import BDBMinimalStorage
+ ConcreteStorage = BDBMinimalStorage.BDBMinimalStorage
class FullTestBase(BerkeleyTestBase):
- from bsddb3Storage import Full
- ConcreteStorage = Full.Full
+ from BDBStorage import BDBFullStorage
+ ConcreteStorage = BDBFullStorage.BDBFullStorage
=== ZODB3/BDBStorage/tests/ZODBTestBase.py 1.6 => 1.7 ===
--- ZODB3/BDBStorage/tests/ZODBTestBase.py:1.6 Tue Nov 5 18:07:32 2002
+++ ZODB3/BDBStorage/tests/ZODBTestBase.py Wed Dec 18 17:15:03 2002
@@ -18,7 +18,7 @@
import errno
from ZODB import DB
-from bsddb3Storage.tests.BerkeleyTestBase import BerkeleyTestBase
+from BDBStorage.tests.BerkeleyTestBase import BerkeleyTestBase
DBHOME = 'test-db'
=== ZODB3/BDBStorage/tests/test_autopack.py 1.4 => 1.5 ===
--- ZODB3/BDBStorage/tests/test_autopack.py:1.4 Tue Nov 19 15:39:39 2002
+++ ZODB3/BDBStorage/tests/test_autopack.py Wed Dec 18 17:15:03 2002
@@ -21,10 +21,10 @@
from ZODB.tests.MinPO import MinPO
from Persistence import Persistent
-from bsddb3Storage.Full import Full
-from bsddb3Storage.Minimal import Minimal
-from bsddb3Storage.BerkeleyBase import BerkeleyConfig
-from bsddb3Storage.tests.BerkeleyTestBase import BerkeleyTestBase
+from BDBStorage.BDBFullStorage import BDBFullStorage
+from BDBStorage.BDBMinimalStorage import BDBMinimalStorage
+from BDBStorage.BerkeleyBase import BerkeleyConfig
+from BDBStorage.tests.BerkeleyTestBase import BerkeleyTestBase
ZERO = '\0'*8
@@ -60,7 +60,7 @@
class TestAutopack(TestAutopackBase):
- ConcreteStorage = Full
+ ConcreteStorage = BDBFullStorage
def checkAutopack(self):
unless = self.failUnless
@@ -93,7 +93,7 @@
class TestAutomaticClassicPack(TestAutopackBase):
- ConcreteStorage = Full
+ ConcreteStorage = BDBFullStorage
def _config(self):
config = BerkeleyConfig()
@@ -174,7 +174,7 @@
class TestMinimalPack(TestAutopackBase):
- ConcreteStorage = Minimal
+ ConcreteStorage = BDBMinimalStorage
def _config(self):
config = BerkeleyConfig()
=== ZODB3/BDBStorage/tests/test_create.py 1.14 => 1.15 ===
--- ZODB3/BDBStorage/tests/test_create.py:1.14 Fri Dec 6 09:47:36 2002
+++ ZODB3/BDBStorage/tests/test_create.py Wed Dec 18 17:15:03 2002
@@ -18,9 +18,9 @@
import time
import unittest
-from bsddb3Storage.BerkeleyBase import BerkeleyConfig
-from bsddb3Storage.tests import BerkeleyTestBase
-from bsddb3Storage.Full import Full
+from BDBStorage.BerkeleyBase import BerkeleyConfig
+from BDBStorage.tests import BerkeleyTestBase
+from BDBStorage.BDBFullStorage import BDBFullStorage
@@ -97,9 +97,9 @@
# This instance won't have the necessary attributes, so the creation
# will fail. We want to be sure that everything gets cleaned up
# enough to fix that and create a proper storage.
- self.assertRaises(AttributeError, Full, self._dir, config=c)
+ self.assertRaises(AttributeError, BDBFullStorage, self._dir, config=c)
c = BerkeleyConfig()
- s = Full(self._dir, config=c)
+ s = BDBFullStorage(self._dir, config=c)
s.close()
=== ZODB3/BDBStorage/tests/test_virgin.py 1.10 => 1.11 ===
--- ZODB3/BDBStorage/tests/test_virgin.py:1.10 Mon Feb 11 18:40:43 2002
+++ ZODB3/BDBStorage/tests/test_virgin.py Wed Dec 18 17:15:03 2002
@@ -34,13 +34,13 @@
class FullNewInsertsTest(ZODBTestBase, InsertMixin):
- from bsddb3Storage import Full
- ConcreteStorage = Full.Full
+ from BDBStorage import BDBFullStorage
+ ConcreteStorage = BDBFullStorage.BDBFullStorage
class MinimalNewInsertsTest(ZODBTestBase, InsertMixin):
- from bsddb3Storage import Minimal
- ConcreteStorage = Minimal.Minimal
+ from BDBStorage import BDBMinimalStorage
+ ConcreteStorage = BDBMinimalStorage.BDBMinimalStorage
=== ZODB3/BDBStorage/tests/test_whitebox.py 1.2 => 1.3 ===
--- ZODB3/BDBStorage/tests/test_whitebox.py:1.2 Tue Nov 5 18:07:32 2002
+++ ZODB3/BDBStorage/tests/test_whitebox.py Wed Dec 18 17:15:03 2002
@@ -19,10 +19,10 @@
from ZODB.utils import U64
from ZODB.tests.MinPO import MinPO
from ZODB.tests.StorageTestBase import zodb_unpickle
-from bsddb3Storage.Minimal import Minimal
-from bsddb3Storage.Full import Full
-from bsddb3Storage.tests.BerkeleyTestBase import BerkeleyTestBase
-from bsddb3Storage.tests.ZODBTestBase import ZODBTestBase
+from BDBStorage.BDBMinimalStorage import BDBMinimalStorage
+from BDBStorage.BDBFullStorage import BDBFullStorage
+from BDBStorage.tests.BerkeleyTestBase import BerkeleyTestBase
+from BDBStorage.tests.ZODBTestBase import ZODBTestBase
from Persistence import Persistent
@@ -36,7 +36,7 @@
class WhiteboxLowLevelMinimal(BerkeleyTestBase):
- ConcreteStorage = Minimal
+ ConcreteStorage = BDBMinimalStorage
def checkTableConsistencyAfterCommit(self):
unless = self.failIf
@@ -80,7 +80,7 @@
class WhiteboxHighLevelMinimal(ZODBTestBase):
- ConcreteStorage = Minimal
+ ConcreteStorage = BDBMinimalStorage
def checkReferenceCounting(self):
eq = self.assertEqual
@@ -167,7 +167,7 @@
class WhiteboxHighLevelFull(ZODBTestBase):
- ConcreteStorage = Full
+ ConcreteStorage = BDBFullStorage
def checkReferenceCounting(self):
eq = self.assertEqual
=== ZODB3/BDBStorage/tests/test_zodb_simple.py 1.8 => 1.9 ===
--- ZODB3/BDBStorage/tests/test_zodb_simple.py:1.8 Fri Aug 23 13:16:12 2002
+++ ZODB3/BDBStorage/tests/test_zodb_simple.py Wed Dec 18 17:15:03 2002
@@ -12,9 +12,9 @@
#
##############################################################################
-# Test some simple ZODB level stuff common to both the Minimal and Full
-# storages, like transaction aborts and commits, changing objects, etc.
-# Doesn't test undo, versions, or packing.
+# Test some simple ZODB level stuff common to both the BDBMinimalStorage and
+# BDBFullStorage storages, like transaction aborts and commits, changing
+# objects, etc. Doesn't test undo, versions, or packing.
import time
import unittest
@@ -69,13 +69,13 @@
class MinimalCommitAndRead(ZODBTestBase, CommitAndRead):
- from bsddb3Storage import Minimal
- ConcreteStorage = Minimal.Minimal
+ from BDBStorage import BDBMinimalStorage
+ ConcreteStorage = BDBMinimalStorage.BDBMinimalStorage
class FullCommitAndRead(ZODBTestBase, CommitAndRead):
- from bsddb3Storage import Full
- ConcreteStorage = Full.Full
+ from BDBStorage import BDBFullStorage
+ ConcreteStorage = BDBFullStorage.BDBFullStorage
=== ZODB3/BDBStorage/tests/timeiter.py 1.3 => 1.4 ===
--- ZODB3/BDBStorage/tests/timeiter.py:1.3 Mon Feb 11 18:40:43 2002
+++ ZODB3/BDBStorage/tests/timeiter.py Wed Dec 18 17:15:03 2002
@@ -65,7 +65,7 @@
from ZODB import utils
from ZODB.TimeStamp import TimeStamp
from ZODB.FileStorage import FileStorage
-from bsddb3Storage.Full import Full
+from BDBStorage.BDBFullStorage import BDBFullStorage
PROGRAM = sys.argv[0]
ZERO = '\0'*8
@@ -157,7 +157,7 @@
#
print >>sys.stderr, 'Opening destination BDB...'
t0 = time.time()
- dstdb = Full(options.dest)
+ dstdb = BDBFullStorage(options.dest)
t1 = time.time()
print >>sys.stderr, 'Opening destination BDB done. %s seconds' % (t1-t0)
=== ZODB3/BDBStorage/tests/timepickles.py 1.2 => 1.3 ===
--- ZODB3/BDBStorage/tests/timepickles.py:1.2 Fri Aug 23 13:16:46 2002
+++ ZODB3/BDBStorage/tests/timepickles.py Wed Dec 18 17:15:03 2002
@@ -65,7 +65,7 @@
from ZODB import utils
from ZODB.TimeStamp import TimeStamp
from ZODB.FileStorage import FileStorage
-from bsddb3Storage.Full import Full
+from BDBStorage.BDBFullStorage import BDBFullStorage
PROGRAM = sys.argv[0]
ZERO = '\0'*8
@@ -157,7 +157,7 @@
#
print >>sys.stderr, 'Opening destination BDB...'
t0 = time.time()
-## dstdb = Full(options.dest)
+## dstdb = BDBFullStorage(options.dest)
dstdb = None
t1 = time.time()
print >>sys.stderr, 'Opening destination BDB done. %s seconds' % (t1-t0)