.

wcfs/internal/xbtree_test.py

@@ -327,6 +327,13 @@ def test_restructure():
     #B = xbtree.Bucket
     #1/0
 
+    # do restructure tests under ZODB because without ZODB connection it is not
+    # always possible to __setstate__ for e.g. .../T/B.
+    zstor = MappingStorage()
+    db = DB(zstor)
+    zconn = db.open()
+    #zroot = zconn.root()
+
     N = 8  # maxkey
 
     X = []  # X[i] = XBlk corresponding to block #i
@@ -336,6 +343,7 @@ def test_restructure():
     # prepare ztree with given keys via usual way
     def Z(*keys):
         ztree = XLOTree() # XXX -> class with node size=2
+        zconn.add(ztree)
         for k in keys:
             ztree[k] = X[k]
         return ztree
@@ -455,7 +463,7 @@ def test_zwalkBFS():
 
     # assign oid to created objects to force btrees not to embed bucket state
     zstor = MappingStorage()
-    db= DB(zstor)
+    db = DB(zstor)
     zconn = db.open()
     zroot = zconn.root()
     zroot['x'] = zt