commit cfa83c1502c450a7eb258e02f029bb430a12b42d
author Matt Rosencrantz <mattr@google.com> Thu Oct 01 17:55:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 01 17:55:52 2015 +0000
tree a8a58f3b07b79e9a0cb18661ea1e843fdf68744d
parent 9bf686392f23e847766e14029bb2d87ef47b02a7
parent f6c1a73073abc8e306dfa2a161f3e168e444efc9

Merge "ref: Fix vdl tests under the new rpc system."

services/syncbase/testutil/util.go

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)
 	}
 }