X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2d046e6afeb13988d1438a05301d60a5d399a371..HEAD:/services/keepproxy/keepproxy_test.go diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go index a24eb752f9..ea8c9ba6ca 100644 --- a/services/keepproxy/keepproxy_test.go +++ b/services/keepproxy/keepproxy_test.go @@ -32,8 +32,8 @@ import ( . "gopkg.in/check.v1" ) -// Gocheck boilerplate func Test(t *testing.T) { + keepclient.DefaultRetryDelay = time.Millisecond TestingT(t) } @@ -346,7 +346,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) { } { - reader, _, _, err := kc.Get(hash) + reader, _, _, err := kc.Get(hash + "+3") c.Check(reader, Equals, nil) c.Check(err, Equals, keepclient.BlockNotFound) c.Log("Finished Get (expected BlockNotFound)") @@ -407,7 +407,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) { { reader, blocklen, _, err := kc.Get("d41d8cd98f00b204e9800998ecf8427e") - c.Assert(err, Equals, nil) + c.Assert(err, IsNil) all, err := ioutil.ReadAll(reader) c.Check(err, IsNil) c.Check(all, DeepEquals, []byte("")) @@ -558,14 +558,14 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) { body, err := ioutil.ReadAll(resp.Body) c.Check(err, IsNil) c.Check(string(body), Equals, "") - c.Check(resp.Header.Get("Access-Control-Allow-Methods"), Equals, "GET, HEAD, POST, PUT, OPTIONS") + c.Check(resp.Header.Get("Access-Control-Allow-Methods"), Equals, "GET, HEAD, PUT, OPTIONS, POST") c.Check(resp.Header.Get("Access-Control-Allow-Origin"), Equals, "*") } { resp, err := http.Get(fmt.Sprintf("http://%s/%x+3", srv.Addr, md5.Sum([]byte("foo")))) c.Check(err, Equals, nil) - c.Check(resp.Header.Get("Access-Control-Allow-Headers"), Equals, "Authorization, Content-Length, Content-Type, X-Keep-Desired-Replicas") + c.Check(resp.Header.Get("Access-Control-Allow-Headers"), Equals, "Authorization, Content-Length, Content-Type, X-Keep-Desired-Replicas, X-Keep-Signature, X-Keep-Storage-Classes") c.Check(resp.Header.Get("Access-Control-Allow-Origin"), Equals, "*") } }