projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7490: Update the previously failing keep_test.go; no new tests added. We can now...
[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 2ccf17d45f78419b63fc5074ab9208c7e2e2c3c0..272fad296d32aea49cddfaeba9b145e71f0fc1e7 100644
(file)
--- a/
services/datamanager/keep/keep_test.go
+++ b/
services/datamanager/keep/keep_test.go
@@
-2,11
+2,14
@@
package keep
import (
"encoding/json"
import (
"encoding/json"
- "git.curoverse.com/arvados.git/sdk/go/keepclient"
- . "gopkg.in/check.v1"
"net/http"
"net/http/httptest"
"testing"
"net/http"
"net/http/httptest"
"testing"
+
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
+
+ . "gopkg.in/check.v1"
)
// Gocheck boilerplate
)
// Gocheck boilerplate
@@
-30,16
+33,18
@@
func (ts *TestHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request)
func (s *KeepSuite) TestSendTrashLists(c *C) {
th := TestHandler{}
server := httptest.NewServer(&th)
func (s *KeepSuite) TestSendTrashLists(c *C) {
th := TestHandler{}
server := httptest.NewServer(&th)
+ defer server.Close()
tl := map[string]TrashList{
server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
tl := map[string]TrashList{
server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
- kc := keepclient.KeepClient{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{})
kc.SetServiceRoots(map[string]string{"xxxx": server.URL},
map[string]string{"xxxx": server.URL},
map[string]string{})
- err := SendTrashLists(
"",
&kc, tl)
+ err := SendTrashLists(&kc, tl)
server.Close()
c.Check(err, IsNil)
server.Close()
c.Check(err, IsNil)
@@
-61,19
+66,22
@@
func sendTrashListError(c *C, server *httptest.Server) {
tl := map[string]TrashList{
server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
tl := map[string]TrashList{
server.URL: TrashList{TrashRequest{"000000000000000000000000deadbeef", 99}}}
- kc := keepclient.KeepClient{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{})
kc.SetServiceRoots(map[string]string{"xxxx": server.URL},
map[string]string{"xxxx": server.URL},
map[string]string{})
- err := SendTrashLists(
"",
&kc, tl)
+ err := SendTrashLists(&kc, tl)
c.Check(err, NotNil)
c.Check(err[0], NotNil)
}
func (s *KeepSuite) TestSendTrashListErrorResponse(c *C) {
c.Check(err, NotNil)
c.Check(err[0], NotNil)
}
func (s *KeepSuite) TestSendTrashListErrorResponse(c *C) {
- sendTrashListError(c, httptest.NewServer(&TestHandlerError{}))
+ server := httptest.NewServer(&TestHandlerError{})
+ sendTrashListError(c, server)
+ defer server.Close()
}
func (s *KeepSuite) TestSendTrashListUnreachable(c *C) {
}
func (s *KeepSuite) TestSendTrashListUnreachable(c *C) {