closes #6260

[arvados.git] / services / datamanager / keep / keep_test.go

diff --git a/services/datamanager/keep/keep_test.go b/services/datamanager/keep/keep_test.go
index 2bf37c8140ba73f2f731e49643c0f40827a88aef..2ccf17d45f78419b63fc5074ab9208c7e2e2c3c0 100644 (file)
--- 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,16 +53,11 @@ 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)
 }
 
-func sendTrashListError(c *C, close_early bool, th http.Handler) {
-       server := httptest.NewServer(th)
-       if close_early {
-               server.Close()
-       }
-
+func sendTrashListError(c *C, server *httptest.Server) {
        tl := map[string]TrashList{
                server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
 
@@ -72,17 +67,15 @@ func sendTrashListError(c *C, close_early bool, th http.Handler) {
                map[string]string{})
 
        err := SendTrashLists("", &kc, tl)
-       if !close_early {
-               server.Close()
-       }
 
+       c.Check(err, NotNil)
        c.Check(err[0], NotNil)
 }
 
 func (s *KeepSuite) TestSendTrashListErrorResponse(c *C) {
-       sendTrashListError(c, false, &TestHandlerError{})
+       sendTrashListError(c, httptest.NewServer(&TestHandlerError{}))
 }
 
 func (s *KeepSuite) TestSendTrashListUnreachable(c *C) {
-       sendTrashListError(c, true, &TestHandler{})
+       sendTrashListError(c, httptest.NewUnstartedServer(&TestHandler{}))
 }