projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5824: Avoid sending empty slices through toRead chan. Fixes race in test case.
[arvados.git]
/
sdk
/
go
/
keepclient
/
keepclient_test.go
diff --git
a/sdk/go/keepclient/keepclient_test.go
b/sdk/go/keepclient/keepclient_test.go
index c03ba90736868d15cdba09d0638e160e60d57998..4615ebc92ef2f8b59bc70ac1d8320833faee8a41 100644
(file)
--- a/
sdk/go/keepclient/keepclient_test.go
+++ b/
sdk/go/keepclient/keepclient_test.go
@@
-14,6
+14,7
@@
import (
"net"
"net/http"
"os"
"net"
"net/http"
"os"
+ "strings"
"testing"
)
"testing"
)
@@
-142,10
+143,9
@@
func (s *StandaloneSuite) TestUploadToStubKeepServer(c *C) {
make(chan string)}
UploadToStubHelper(c, st,
make(chan string)}
UploadToStubHelper(c, st,
- func(kc *KeepClient, url string, reader io.ReadCloser,
- writer io.WriteCloser, upload_status chan uploadStatus) {
+ func(kc *KeepClient, url string, reader io.ReadCloser, writer io.WriteCloser, upload_status chan uploadStatus) {
- go kc.uploadToKeepServer(url, st.expectPath, reader, upload_status, int64(len("foo")),
"TestUploadToStubKeepServer"
)
+ go kc.uploadToKeepServer(url, st.expectPath, reader, upload_status, int64(len("foo")),
0
)
writer.Write([]byte("foo"))
writer.Close()
writer.Write([]byte("foo"))
writer.Close()
@@
-177,7
+177,7
@@
func (s *StandaloneSuite) TestUploadToStubKeepServerBufferReader(c *C) {
br1 := tr.MakeStreamReader()
br1 := tr.MakeStreamReader()
- go kc.uploadToKeepServer(url, st.expectPath, br1, upload_status, 3,
"TestUploadToStubKeepServerBufferReader"
)
+ go kc.uploadToKeepServer(url, st.expectPath, br1, upload_status, 3,
0
)
writer.Write([]byte("foo"))
writer.Close()
writer.Write([]byte("foo"))
writer.Close()
@@
-237,7
+237,7
@@
func (s *StandaloneSuite) TestFailedUploadToStubKeepServer(c *C) {
func(kc *KeepClient, url string, reader io.ReadCloser,
writer io.WriteCloser, upload_status chan uploadStatus) {
func(kc *KeepClient, url string, reader io.ReadCloser,
writer io.WriteCloser, upload_status chan uploadStatus) {
- go kc.uploadToKeepServer(url, hash, reader, upload_status, 3,
"TestFailedUploadToStubKeepServer"
)
+ go kc.uploadToKeepServer(url, hash, reader, upload_status, 3,
0
)
writer.Write([]byte("foo"))
writer.Close()
writer.Write([]byte("foo"))
writer.Close()
@@
-556,7
+556,10
@@
func (s *StandaloneSuite) TestGetFail(c *C) {
kc.Retries = 0
r, n, url2, err := kc.Get(hash)
kc.Retries = 0
r, n, url2, err := kc.Get(hash)
- c.Check(err, Equals, BlockNotFound)
+ errNotFound, _ := err.(*ErrNotFound)
+ c.Check(errNotFound, NotNil)
+ c.Check(strings.Contains(errNotFound.Error(), "HTTP 500"), Equals, true)
+ c.Check(errNotFound.Temporary(), Equals, true)
c.Check(n, Equals, int64(0))
c.Check(url2, Equals, "")
c.Check(r, Equals, nil)
c.Check(n, Equals, int64(0))
c.Check(url2, Equals, "")
c.Check(r, Equals, nil)
@@
-601,7
+604,10
@@
func (s *StandaloneSuite) TestGetNetError(c *C) {
kc.SetServiceRoots(map[string]string{"x": "http://localhost:62222"}, nil, nil)
r, n, url2, err := kc.Get(hash)
kc.SetServiceRoots(map[string]string{"x": "http://localhost:62222"}, nil, nil)
r, n, url2, err := kc.Get(hash)
- c.Check(err, Equals, BlockNotFound)
+ errNotFound, _ := err.(*ErrNotFound)
+ c.Check(errNotFound, NotNil)
+ c.Check(strings.Contains(errNotFound.Error(), "connection refused"), Equals, true)
+ c.Check(errNotFound.Temporary(), Equals, true)
c.Check(n, Equals, int64(0))
c.Check(url2, Equals, "")
c.Check(r, Equals, nil)
c.Check(n, Equals, int64(0))
c.Check(url2, Equals, "")
c.Check(r, Equals, nil)