.

wcfs/wcfs_test.py

@@ -35,8 +35,7 @@ from persistent.timestamp import TimeStamp
 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 golang import context, sync
 from zodbtools.util import ashex as h, fromhex
 from pytest import raises
 from .internal import mm
@@ -651,15 +650,15 @@ def test_wcfs():
     w = t.openwatch()
 
     ctx = context.background()  # XXX stub
-    wg, ctx = errgroup.with_context(ctx)
+    wg = sync.WorkGroup(ctx)
 
-    def _():
+    def _(ctx):
         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")
     wg.go(_)
-    def _():
+    def _(ctx):
         assert w.sendReq(ctx, b"watch %s @%s" % (h(zf._p_oid), h(at1))) == "ok"
     wg.go(_)
     wg.wait()