.

wcfs/internal/xbtree.py

@@ -390,7 +390,7 @@ def Restructure(ztree, newStructure):
 
     # set znode states according to established tnew->znode association
     rlevelv = rlevelv_orig
-    for rnodev in rlevelv:
+    for rnodev in reversed(rlevelv): # bottom -> up
         for rn in rnodev:
             node = rn.node
             assert isinstance(node, (Tree,Bucket))

wcfs/internal/xbtree_test.py

@@ -534,8 +534,14 @@ def test_restructure():
     assert isinstance(b3, LOBucket)
     assert crack_bucket(b1) == ([1], [X[1]])
     assert crack_bucket(b3) == ([3], [X[3]])
+    assert b1._p_oid is None
+    assert b3._p_oid is None
     R(z, 'T/B1,3')
     kind, keys, kids = crack_btree(z)
+    # XXX here -> btree_one
+
+
+    # XXX -> after commit
     assert (kind, keys) == (BTREE_NORMAL, [])
     assert len(kids) == 1
     b13 = kids[0]