X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b17b1ad22bd3cf518eb1b3657f62768b60c7db25..47e42f1129363c2565e69c36ff26ce9c42731fb8:/services/datamanager/keep/keep_test.go

diff --git a/services/datamanager/keep/keep_test.go b/services/datamanager/keep/keep_test.go
index 2286453b2f..ca8797ea6e 100644
--- a/services/datamanager/keep/keep_test.go
+++ b/services/datamanager/keep/keep_test.go
@@ -43,15 +43,15 @@ func (s *KeepSuite) TestSendTrashLists(c *C) {
 	defer server.Close()
 
 	tl := map[string]TrashList{
-		server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
+		server.URL: {TrashRequest{"000000000000000000000000deadbeef", 99}}}
 
-	arv := arvadosclient.ArvadosClient{ApiToken: "abc123"}
-	kc := keepclient.KeepClient{Arvados: &arv, Client: &http.Client{}}
+	arv := &arvadosclient.ArvadosClient{ApiToken: "abc123"}
+	kc := keepclient.KeepClient{Arvados: arv, Client: &http.Client{}}
 	kc.SetServiceRoots(map[string]string{"xxxx": server.URL},
 		map[string]string{"xxxx": server.URL},
 		map[string]string{})
 
-	err := SendTrashLists(&kc, tl)
+	err := SendTrashLists(nil, &kc, tl, false)
 
 	c.Check(err, IsNil)
 
@@ -70,15 +70,15 @@ func (tse *TestHandlerError) ServeHTTP(writer http.ResponseWriter, req *http.Req
 
 func sendTrashListError(c *C, server *httptest.Server) {
 	tl := map[string]TrashList{
-		server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
+		server.URL: {TrashRequest{"000000000000000000000000deadbeef", 99}}}
 
-	arv := arvadosclient.ArvadosClient{ApiToken: "abc123"}
-	kc := keepclient.KeepClient{Arvados: &arv, Client: &http.Client{}}
+	arv := &arvadosclient.ArvadosClient{ApiToken: "abc123"}
+	kc := keepclient.KeepClient{Arvados: arv, Client: &http.Client{}}
 	kc.SetServiceRoots(map[string]string{"xxxx": server.URL},
 		map[string]string{"xxxx": server.URL},
 		map[string]string{})
 
-	err := SendTrashLists(&kc, tl)
+	err := SendTrashLists(nil, &kc, tl, false)
 
 	c.Check(err, NotNil)
 	c.Check(err[0], NotNil)
@@ -101,7 +101,7 @@ type APITestData struct {
 }
 
 func (s *KeepSuite) TestGetKeepServers_UnsupportedServiceType(c *C) {
-	testGetKeepServersFromAPI(c, APITestData{1, "notadisk", 200}, "Found no keepservices with the supported type disk")
+	testGetKeepServersFromAPI(c, APITestData{1, "notadisk", 200}, "Found no keepservices with the service type disk")
 }
 
 func (s *KeepSuite) TestGetKeepServers_ReceivedTooFewServers(c *C) {
@@ -132,14 +132,14 @@ func testGetKeepServersFromAPI(c *C, testData APITestData, expectedError string)
 	api := httptest.NewServer(&apiStub)
 	defer api.Close()
 
-	arv := arvadosclient.ArvadosClient{
+	arv := &arvadosclient.ArvadosClient{
 		Scheme:    "http",
 		ApiServer: api.URL[7:],
 		ApiToken:  "abc123",
 		Client:    &http.Client{Transport: &http.Transport{}},
 	}
 
-	kc := keepclient.KeepClient{Arvados: &arv, Client: &http.Client{}}
+	kc := keepclient.KeepClient{Arvados: arv, Client: &http.Client{}}
 	kc.SetServiceRoots(map[string]string{"xxxx": "http://example.com:23456"},
 		map[string]string{"xxxx": "http://example.com:23456"},
 		map[string]string{})
@@ -233,14 +233,14 @@ func testGetKeepServersAndSummarize(c *C, testData KeepServerTestData) {
 	api := httptest.NewServer(&apiStub)
 	defer api.Close()
 
-	arv := arvadosclient.ArvadosClient{
+	arv := &arvadosclient.ArvadosClient{
 		Scheme:    "http",
 		ApiServer: api.URL[7:],
 		ApiToken:  "abc123",
 		Client:    &http.Client{Transport: &http.Transport{}},
 	}
 
-	kc := keepclient.KeepClient{Arvados: &arv, Client: &http.Client{}}
+	kc := keepclient.KeepClient{Arvados: arv, Client: &http.Client{}}
 	kc.SetServiceRoots(map[string]string{"xxxx": ks.URL},
 		map[string]string{"xxxx": ks.URL},
 		map[string]string{})