.

wcfs/wcfs_test.py

@@ -1334,18 +1334,18 @@ def test_wcfs_watch_setup():
     defer(t.close)
 
     f = t.open(zf)
-    at1 = t.commit(zf, {2:'c1'})                    # XXX + hold -> zblk
-    at2 = t.commit(zf, {2:'c2', 3:'d2', 5:'f2'})
+    at1 = t.commit(zf, {2:'c1'})                # XXX + hole -> zblk
+    at2 = t.commit(zf, {2:'c2', 3:'d2', 4:'e2', 5:'f2'})
     at3 = t.commit(zf, {2:'c3', 5:'f3'})
 
-    f.assertData(['','','c3','d2','','f3'])     # access everything as of @at3
-    f.assertCache([1,1,1,1,1,1])
+    f.assertData(['','','c3','d2','x','f3'])     # access everything except e as of @at3
+    f.assertCache([1,1,1,1,0,1])
 
-    # change again, but don't access f
-    at4 = t.commit(zf, {2:'c4', 5:'f4'})
+    # change again, but don't access e and f
+    at4 = t.commit(zf, {2:'c4', 4:'e4', 5:'f4'})
     at5 = t.commit(zf, {3:'d5', 5:'f5'})
-    f.assertData(['','','c4','d5','','x'])
-    f.assertCache([1,1,1,1,1,0])
+    f.assertData(['','','c4','d5','x','x'])
+    f.assertCache([1,1,1,1,0,0])
 
     # some watch setup/update requests with explicit pinok (also partly
     # verifies how tWatchLink.watch computes automatic pinok)
@@ -1370,7 +1370,6 @@ def test_wcfs_watch_setup():
     wl.watch(zf, at4, {2:None,         5:at4})  # at3 -> at4 f(5) pinned even it was not accessed >=4
     wl.watch(zf, at5, {        3:None, 5:None}) # at4 -> at5 (current head)
     wl.close()
-    return
 
     # all valid watch setup/update requests going at_i -> at_j -> ... with automatic pinok
     for zf in t.zfiles():