.

wcfs/wcfs_test.py

@@ -406,12 +406,12 @@ class tWatch:
 
             reply = bool(stream % 2)
             if reply:
-                with t._mu:
+                with t._rxmu:
                     assert stream in t._rxtab
                     rxq = t._rxtabs[stream]
                 rxq.send(msg)
             else:
-                with t._mu:
+                with t._rxmu:
                     assert stream not in t._accepted
                     t._accepted.add(stream)
                 t._acceptq.send((stream, msg))
@@ -431,7 +431,7 @@ class tWatch:
         stream = 1
 
         rxq = chan()
-        with t._mu:
+        with t._rxmu:
             assert stream not in t._rxtab
             t._rxtab[stream] = rxq
 
@@ -587,14 +587,15 @@ def test_wcfs():
     @func
     def _():
         defer(done.close)
-        pinv = w.expectPin([(zf, blk, at), (zf, blk, at)])
+        pinv = w.expectPin([(zf, 2, at1), (zf, 3, at1)])
         for p in pinv:
             p.ack()
     go(_)
-    assert w.sentReq("watch %s @%s", zf, at1) == "ok"
+    assert w.sendReq(b"watch %s @%s" % (h(zf._p_oid), h(at1))) == "ok"
     done.recv()
 
-    tdb.watch(zf, at1)  # XXX <- pin @at2 @at3
+    w = t.watch(zf, at1)  # XXX <- pin @at2 @at3
+    #t.watch(zf, at1, {2: at1, 3: at1})  # XXX <- pin @at2 @at3