X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/91b7b7fd54c4728ac6cf12181efc1fed60157ecb..073396900805175acfc32f974abfea91c456e986:/services/datamanager/keep/keep_test.go diff --git a/services/datamanager/keep/keep_test.go b/services/datamanager/keep/keep_test.go index 08de024a09..2ccf17d45f 100644 --- a/services/datamanager/keep/keep_test.go +++ b/services/datamanager/keep/keep_test.go @@ -22,9 +22,9 @@ type TestHandler struct { request TrashList } -func (this *TestHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request) { +func (ts *TestHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request) { r := json.NewDecoder(req.Body) - r.Decode(&this.request) + r.Decode(&ts.request) } func (s *KeepSuite) TestSendTrashLists(c *C) { @@ -42,7 +42,7 @@ func (s *KeepSuite) TestSendTrashLists(c *C) { err := SendTrashLists("", &kc, tl) server.Close() - c.Check(err[0], IsNil) + c.Check(err, IsNil) c.Check(th.request, DeepEquals, @@ -53,7 +53,7 @@ func (s *KeepSuite) TestSendTrashLists(c *C) { type TestHandlerError struct { } -func (this *TestHandlerError) ServeHTTP(writer http.ResponseWriter, req *http.Request) { +func (tse *TestHandlerError) ServeHTTP(writer http.ResponseWriter, req *http.Request) { http.Error(writer, "I'm a teapot", 418) } @@ -68,6 +68,7 @@ func sendTrashListError(c *C, server *httptest.Server) { err := SendTrashLists("", &kc, tl) + c.Check(err, NotNil) c.Check(err[0], NotNil) }