.

wcfs/wcfs_test.py

@@ -36,6 +36,7 @@ import os, os.path, subprocess, threading
 from errno import EINVAL
 from golang import go, chan, func, defer, select
 from golang import context
+from golang.x.sync import errgroup
 from zodbtools.util import ashex as h, fromhex
 from pytest import raises
 from .internal import mm
@@ -650,18 +651,18 @@ def test_wcfs():
     w = t.openwatch()
 
     ctx = context.background()  # XXX stub
+    wg, ctx = errgroup.with_context(ctx)
 
-    done = chan()
-    @func
     def _():
-        defer(done.close)
         pinv = w.expectPin(ctx, [(zf, 2, at1), (zf, 3, at0)])
         #pinv = w.expectPin(ctx, {zf: [(2, at1), (3, at0)]})     XXX <- this way better? (sugar)
         for p in pinv:
             p.reply(b"ack")
-    go(_)
-    assert w.sendReq(ctx, b"watch %s @%s" % (h(zf._p_oid), h(at1))) == "ok"
-    done.recv()
+    wg.go(_)
+    def _():
+        assert w.sendReq(ctx, b"watch %s @%s" % (h(zf._p_oid), h(at1))) == "ok"
+    wg.go(_)
+    wg.wait()
     print('\nCCC\n')