[Zodb-checkins] CVS: Zope3/src/zodb/btrees/tests - test_btrees.py:1.4.6.1

Jeremy Hylton jeremy@zope.com
Tue, 18 Feb 2003 09:53:30 -0500


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

Modified Files:
      Tag: ZODB3-2-integration-branch
	test_btrees.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/btrees/tests/test_btrees.py 1.4 => 1.4.6.1 ===
--- Zope3/src/zodb/btrees/tests/test_btrees.py:1.4	Fri Jan 31 14:50:30 2003
+++ Zope3/src/zodb/btrees/tests/test_btrees.py	Tue Feb 18 09:52:59 2003
@@ -17,7 +17,8 @@
 from zodb.btrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
 
 from zodb.btrees.check import check
-
+from zodb.db import DB
+from zodb.storage.file import FileStorage
 
 from transaction import get_transaction
 
@@ -33,9 +34,8 @@
         del self.t
 
     def _getRoot(self):
-        from zodb.storage.file import DB
         n = 'fs_tmp__%s' % os.getpid()
-        db = DB(n, cache_size=1)
+        db = DB(FileStorage(n), cache_size=1)
         root = db.open().root()
         return root