Merge "services/xproxyd: Fix error message."
diff --git a/cmd/vdl/arith_test.go b/cmd/vdl/arith_test.go
index ae84453..8ae1706 100644
--- a/cmd/vdl/arith_test.go
+++ b/cmd/vdl/arith_test.go
@@ -103,7 +103,7 @@
ctx, shutdown := test.V23Init()
defer shutdown()
- ctx, server, err := v23.WithNewServer(ctx, "", arith.CalculatorServer(&serverCalculator{}), nil)
+ _, server, err := v23.WithNewServer(ctx, "", arith.CalculatorServer(&serverCalculator{}), nil)
if err != nil {
t.Fatal(err)
}
@@ -287,7 +287,7 @@
}
for i, obj := range objects {
- ctx, server, err := v23.WithNewServer(ctx, "", obj, nil)
+ _, server, err := v23.WithNewServer(ctx, "", obj, nil)
if err != nil {
t.Fatalf("%d: %v", i, err)
}
diff --git a/services/syncbase/testutil/util.go b/services/syncbase/testutil/util.go
index 31e8cea..7c40dba 100644
--- a/services/syncbase/testutil/util.go
+++ b/services/syncbase/testutil/util.go
@@ -233,6 +233,7 @@
if err != nil {
vlog.Fatal("ioutil.TempDir() failed: ", err)
}
+ serverCtx, cancel := context.WithCancel(serverCtx)
service, err := server.NewService(serverCtx, nil, server.ServiceOptions{
Perms: perms,
RootDir: rootDir,
@@ -247,7 +248,8 @@
}
name := s.Status().Endpoints[0].Name()
return name, func() {
- s.Stop()
+ cancel()
+ <-s.Closed()
os.RemoveAll(rootDir)
}
}
