projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21508: Fix cross origin io parameter image previews
[arvados.git]
/
services
/
keepproxy
/
keepproxy_test.go
diff --git
a/services/keepproxy/keepproxy_test.go
b/services/keepproxy/keepproxy_test.go
index f57aeb3617cc9a8c59197c520563eb23a79465f2..2c73e2d1040d1b37df4e77375b5a859d3187565e 100644
(file)
--- a/
services/keepproxy/keepproxy_test.go
+++ b/
services/keepproxy/keepproxy_test.go
@@
-32,8
+32,8
@@
import (
. "gopkg.in/check.v1"
)
. "gopkg.in/check.v1"
)
-// Gocheck boilerplate
func Test(t *testing.T) {
func Test(t *testing.T) {
+ keepclient.DefaultRetryDelay = time.Millisecond
TestingT(t)
}
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)")
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")
{
reader, blocklen, _, err := kc.Get("d41d8cd98f00b204e9800998ecf8427e")
- c.Assert(err,
Equals, n
il)
+ c.Assert(err,
IsN
il)
all, err := ioutil.ReadAll(reader)
c.Check(err, IsNil)
c.Check(all, DeepEquals, []byte(""))
all, err := ioutil.ReadAll(reader)
c.Check(err, IsNil)
c.Check(all, DeepEquals, []byte(""))
@@
-641,7
+641,7
@@
func getIndexWorker(c *C, useConfig bool) {
c.Check(rep, Equals, 2)
c.Check(err, Equals, nil)
c.Check(rep, Equals, 2)
c.Check(err, Equals, nil)
- reader, blocklen, _, err := kc.Get(hash)
+ reader, blocklen, _, err := kc.Get(hash
2
)
c.Assert(err, IsNil)
c.Check(blocklen, Equals, int64(10))
all, err := ioutil.ReadAll(reader)
c.Assert(err, IsNil)
c.Check(blocklen, Equals, int64(10))
all, err := ioutil.ReadAll(reader)
@@
-783,10
+783,12
@@
func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
},
} {
err := f()
},
} {
err := f()
- c.
Assert
(err, NotNil)
+ c.
Check
(err, NotNil)
errNotFound, _ := err.(*keepclient.ErrNotFound)
errNotFound, _ := err.(*keepclient.ErrNotFound)
- c.Check(errNotFound.Temporary(), Equals, true)
- c.Check(err, ErrorMatches, `.*HTTP 502.*`)
+ if c.Check(errNotFound, NotNil) {
+ c.Check(errNotFound.Temporary(), Equals, true)
+ c.Check(err, ErrorMatches, `.*HTTP 502.*`)
+ }
}
}
}
}