5185: in project data collections tab, show description when available; otherwise...

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

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 0b75bb65f7b32146a1d63565600134568af77ea2..ccbd7d8790c5042566aff7bb4941f56a0c91e26a 100644 (file)
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -107,17 +107,22 @@ func runProxy(c *C, args []string, port int, bogusClientToken bool) keepclient.K
        if bogusClientToken {
                os.Setenv("ARVADOS_API_TOKEN", "bogus-token")
        }
-       os.Setenv("ARVADOS_KEEP_PROXY", fmt.Sprintf("http://localhost:%v", port))
        arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, Equals, nil)
-       kc, err := keepclient.MakeKeepClient(&arv)
-       c.Assert(err, Equals, nil)
+       kc := keepclient.KeepClient{
+               Arvados: &arv,
+               Want_replicas: 2,
+               Using_proxy: true,
+               Client: &http.Client{},
+       }
+       kc.SetServiceRoots(map[string]string{
+               "proxy": fmt.Sprintf("http://localhost:%v", port),
+       })
        c.Check(kc.Using_proxy, Equals, true)
        c.Check(len(kc.ServiceRoots()), Equals, 1)
        for _, root := range kc.ServiceRoots() {
                c.Check(root, Equals, fmt.Sprintf("http://localhost:%v", port))
        }
-       os.Unsetenv("ARVADOS_KEEP_PROXY")
        log.Print("keepclient created")
        if bogusClientToken {
                arvadostest.ResetEnv()