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

[Jeremy Hylton]

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

Modified Files:
	test_btrees.py 
Log Message:
Merge the ZODB3-2-integration branch to the trunk.

The primary changes here are to port the many new ZEO features from
ZODB 3.2.  There are also many changes to the test suite.

python2.2 tells me: Ran 3755 tests in 560.277s


=== Zope3/src/zodb/btrees/tests/test_btrees.py 1.6 => 1.7 ===
--- Zope3/src/zodb/btrees/tests/test_btrees.py:1.6	Sat Feb 22 01:00:18 2003
+++ Zope3/src/zodb/btrees/tests/test_btrees.py	Tue Feb 25 13:55:02 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