.

wcfs/wcfs_test.py

@@ -1743,52 +1743,51 @@ def test_wcfspy_virtmem():
     wconn = t.wc.connect(at1)
     defer(wconn.close)
 
-    wf = wconn.open(zf._p_oid)
-    # XXX defer(wf.close)
+    fh = wconn.open(zf._p_oid)
+    # XXX defer(fh.close)
 
     # create mmap with 1 block beyond file size
-    m1 = wf.mmap(2, 3)
+    m1 = fh.mmap(2, 3)
     defer(m1.unmap)
 
     assert m1.blk_start == 2
     assert m1.blk_stop  == 5
     assert len(m1.mem)  == 3*zf.blksize
 
-    f = m1.file
     tm1 = tMapping(m1)
 
     #assertCache(m1, [0,0,0])
-    assert f.pinned == {}
+    assert fh.pinned == {}
 
     # verify initial data reads
     tm1.assertBlk(2, 'c1')
-    assert f.pinned == {2:at1}
+    assert fh.pinned == {2:at1}
     tm1.assertBlk(3, 'd1')
-    assert f.pinned == {2:at1}
+    assert fh.pinned == {2:at1}
     tm1.assertBlk(4, '')
-    assert f.pinned == {2:at1}
+    assert fh.pinned == {2:at1}
 
     # commit with growing file size -> verify data read as the same, #3 pinned.
     # (#4 is not yet pinned because it was not accessed)
     at3 = t.commit(zf, {3:'d3', 4:'e3'})
-    assert f.pinned == {2:at1}
+    assert fh.pinned == {2:at1}
     tm1.assertBlk(2, 'c1')
-    assert f.pinned == {2:at1}
+    assert fh.pinned == {2:at1}
     tm1.assertBlk(3, 'd1')
-    assert f.pinned == {2:at1, 3:at1}
+    assert fh.pinned == {2:at1, 3:at1}
     tm1.assertBlk(4, '')
-    assert f.pinned == {2:at1, 3:at1}
+    assert fh.pinned == {2:at1, 3:at1}
 
     # resync at1 -> at2:    #2 must unpin to @head; #4 must stay as zero
     wconn.resync(at2)
-    assert f.pinned == {3:at1}
+    assert fh.pinned == {3:at1}
     tm1.assertBlk(2, 'c2')
     tm1.assertBlk(3, 'd1')
     tm1.assertBlk(4, '')
 
     # resync at2 -> at3:    #3 must unpin to @head; #4 - start to read with data
     wconn.resync(at3)
-    assert f.pinned == {}
+    assert fh.pinned == {}
     tm1.assertBlk(2, 'c2')
     tm1.assertBlk(3, 'd3')
     tm1.assertBlk(4, 'e3')