[Zodb-checkins] CVS: Zope3/src/zodb/tests - test_connection.py:1.2.10.1 test_pool.py:1.1.6.1 test_zodb.py:1.3.6.1

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-2-integration-branch
	test_connection.py test_pool.py test_zodb.py 
Log Message:
Nearly complete port of ZODB 3.2 features to Zope3.

Must still resolve 6 failing tests -- 4 for read-only FS, 2 for
verification. 

Remove use of DB helper functions in storage modules.  It's easier to
use the config stuff moving forward.

Fiddle commit lock tests to run on all storages when possible.  Two
unknown problems with BDB.

Synthesize appropriate ZEO+storage tests from consituent classes.


=== Zope3/src/zodb/tests/test_connection.py 1.2 => 1.2.10.1 ===
--- Zope3/src/zodb/tests/test_connection.py:1.2	Wed Dec 25 09:12:21 2002
+++ Zope3/src/zodb/tests/test_connection.py	Tue Feb 18 09:53:01 2003
@@ -16,7 +16,8 @@
 from persistence import Persistent
 from transaction.tests.abstestIDataManager import IDataManagerTests
 
-from zodb.storage.mapping import DB
+from zodb.db import DB
+from zodb.storage.mapping import MappingStorage
 from zodb.ztransaction import Transaction
 
 class P(Persistent):
@@ -25,7 +26,7 @@
 class ConnectionTests(IDataManagerTests):
 
     def setUp(self):
-        self.db = DB()
+        self.db = DB(MappingStorage())
         self.datamgr = self.db.open()
         self.obj = P()
         self.txn_factory = Transaction


=== Zope3/src/zodb/tests/test_pool.py 1.1 => 1.1.6.1 ===
--- Zope3/src/zodb/tests/test_pool.py:1.1	Tue Jan 21 13:19:56 2003
+++ Zope3/src/zodb/tests/test_pool.py	Tue Feb 18 09:53:01 2003
@@ -17,7 +17,8 @@
 import time
 import unittest
 
-from zodb.storage.mapping import DB
+from zodb.db import DB
+from zodb.storage.mapping import MappingStorage
 
 class Counter:
 
@@ -60,7 +61,7 @@
 
     def setUp(self):
         self.close = threading.Event()
-        self.db = DB(pool_size=7)
+        self.db = DB(MappingStorage(), pool_size=7)
         self.threads = []
 
     def tearDown(self):


=== Zope3/src/zodb/tests/test_zodb.py 1.3 => 1.3.6.1 ===
--- Zope3/src/zodb/tests/test_zodb.py:1.3	Tue Jan 28 11:42:23 2003
+++ Zope3/src/zodb/tests/test_zodb.py	Tue Feb 18 09:53:01 2003
@@ -15,7 +15,8 @@
 import unittest
 import tempfile
 
-from zodb.storage.file import DB
+from zodb.db import DB
+from zodb.storage.file import FileStorage
 from zodb.utils import u64
 from zodb.tests.undo import TransactionalUndoDB
 from persistence.dict import PersistentDict
@@ -105,7 +106,7 @@
                 unittest.TestCase):
 
     def setUp(self):
-        self._db = DB(_fsname, create=1)
+        self._db = DB(FileStorage(_fsname, create=True))
         self._conn = self._db.open()
         self._root = self._conn.root()