X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a74c81b035c67d299e2a7298f8db3d368a578510..47e42f1129363c2565e69c36ff26ce9c42731fb8:/services/datamanager/keep/keep_test.go diff --git a/services/datamanager/keep/keep_test.go b/services/datamanager/keep/keep_test.go index 6698849848..ca8797ea6e 100644 --- a/services/datamanager/keep/keep_test.go +++ b/services/datamanager/keep/keep_test.go @@ -45,8 +45,8 @@ func (s *KeepSuite) TestSendTrashLists(c *C) { tl := map[string]TrashList{ 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{}) @@ -72,8 +72,8 @@ func sendTrashListError(c *C, server *httptest.Server) { tl := map[string]TrashList{ 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{}) @@ -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{})