13647: Merge branch 'master' into 13647-keepstore-config

[arvados.git] / services / keepproxy / keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 5f19c8c1f93c0c712d8cd6256f432a82cb698a0f..d2758cc25f7ea3f92b35ec461f0d41c87958c72e 100644 (file)
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -107,7 +107,10 @@ func runProxy(c *C, bogusClientToken bool) *keepclient.KeepClient {
        cluster.Services.Keepproxy.InternalURLs = map[arvados.URL]arvados.ServiceInstance{arvados.URL{Host: ":0"}: arvados.ServiceInstance{}}
 
        listener = nil
-       go run(log.New(), cluster)
+       go func() {
+               run(log.New(), cluster)
+               defer closeListener()
+       }()
        waitForListener()
 
        client := arvados.NewClientFromEnv()