X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/97e8290d683afff06fe2e9a4cec522a871a96df3..fd9342c42faaf2c6aa2a6800fe91172bf24e2916:/lib/service/cmd_test.go

diff --git a/lib/service/cmd_test.go b/lib/service/cmd_test.go
index ec7834972c..10591d9b55 100644
--- a/lib/service/cmd_test.go
+++ b/lib/service/cmd_test.go
@@ -29,6 +29,11 @@ func Test(t *testing.T) {
 var _ = check.Suite(&Suite{})
 
 type Suite struct{}
+type key int
+
+const (
+	contextKey key = iota
+)
 
 func (*Suite) TestCommand(c *check.C) {
 	cf, err := ioutil.TempFile("", "cmd_test.")
@@ -42,11 +47,11 @@ func (*Suite) TestCommand(c *check.C) {
 	defer cancel()
 
 	cmd := Command(arvados.ServiceNameController, func(ctx context.Context, _ *arvados.Cluster, token string, reg *prometheus.Registry) Handler {
-		c.Check(ctx.Value("foo"), check.Equals, "bar")
+		c.Check(ctx.Value(contextKey), check.Equals, "bar")
 		c.Check(token, check.Equals, "abcde")
 		return &testHandler{ctx: ctx, healthCheck: healthCheck}
 	})
-	cmd.(*command).ctx = context.WithValue(ctx, "foo", "bar")
+	cmd.(*command).ctx = context.WithValue(ctx, contextKey, "bar")
 
 	done := make(chan bool)
 	var stdin, stdout, stderr bytes.Buffer
@@ -107,6 +112,7 @@ Clusters:
 				continue
 			}
 			body, err := ioutil.ReadAll(resp.Body)
+			c.Check(err, check.IsNil)
 			c.Logf("status %d, body %s", resp.StatusCode, string(body))
 			c.Check(resp.StatusCode, check.Equals, http.StatusOK)
 			break