X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a1ad1f1d7ce5edf62945340c34ba5e22a36f1157..cd00c7d65d724ea78fe6e59dda333241a7c0775a:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 0b75bb65f7..ccbd7d8790 100644
--- 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()