projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 11453-federated-tokens
[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 f0da600c24187f05cb3e8b2ab97512677c072794..3ce4e7425aa273e2753ddcaab516a86ecd34d59a 100644
(file)
--- a/
sdk/go/keepclient/keepclient_test.go
+++ b/
sdk/go/keepclient/keepclient_test.go
@@
-1,12
+1,13
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
package keepclient
import (
"crypto/md5"
package keepclient
import (
"crypto/md5"
+ "errors"
"fmt"
"fmt"
- "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
- "git.curoverse.com/arvados.git/sdk/go/arvadostest"
- "git.curoverse.com/arvados.git/sdk/go/streamer"
- . "gopkg.in/check.v1"
"io"
"io/ioutil"
"log"
"io"
"io/ioutil"
"log"
@@
-16,6
+17,11
@@
import (
"strings"
"testing"
"time"
"strings"
"testing"
"time"
+
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.curoverse.com/arvados.git/sdk/go/streamer"
+ . "gopkg.in/check.v1"
)
// Gocheck boilerplate
)
// Gocheck boilerplate
@@
-33,6
+39,10
@@
type ServerRequiredSuite struct{}
// Standalone tests
type StandaloneSuite struct{}
// Standalone tests
type StandaloneSuite struct{}
+func (s *StandaloneSuite) SetUpTest(c *C) {
+ RefreshServiceDiscovery()
+}
+
func pythonDir() string {
cwd, _ := os.Getwd()
return fmt.Sprintf("%s/../../python/tests", cwd)
func pythonDir() string {
cwd, _ := os.Getwd()
return fmt.Sprintf("%s/../../python/tests", cwd)
@@
-48,6
+58,10
@@
func (s *ServerRequiredSuite) TearDownSuite(c *C) {
arvadostest.StopAPI()
}
arvadostest.StopAPI()
}
+func (s *ServerRequiredSuite) SetUpTest(c *C) {
+ RefreshServiceDiscovery()
+}
+
func (s *ServerRequiredSuite) TestMakeKeepClient(c *C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, Equals, nil)
func (s *ServerRequiredSuite) TestMakeKeepClient(c *C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, Equals, nil)
@@
-97,7
+111,9
@@
func (sph StubPutHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request)
func RunFakeKeepServer(st http.Handler) (ks KeepServer) {
var err error
func RunFakeKeepServer(st http.Handler) (ks KeepServer) {
var err error
- ks.listener, err = net.ListenTCP("tcp", &net.TCPAddr{Port: 0})
+ // If we don't explicitly bind it to localhost, ks.listener.Addr() will
+ // bind to 0.0.0.0 or [::] which is not a valid address for Dial()
+ ks.listener, err = net.ListenTCP("tcp", &net.TCPAddr{IP: []byte{127, 0, 0, 1}, Port: 0})
if err != nil {
panic(fmt.Sprintf("Could not listen on any port"))
}
if err != nil {
panic(fmt.Sprintf("Could not listen on any port"))
}
@@
-435,7
+451,7
@@
func (s *StandaloneSuite) TestPutWithTooManyFail(c *C) {
_, replicas, err := kc.PutB([]byte("foo"))
_, replicas, err := kc.PutB([]byte("foo"))
- c.Check(err,
Equals, InsufficientReplicasError
)
+ c.Check(err,
FitsTypeOf, InsufficientReplicasError(errors.New(""))
)
c.Check(replicas, Equals, 1)
c.Check(<-st.handled, Equals, ks1[0].url)
}
c.Check(replicas, Equals, 1)
c.Check(<-st.handled, Equals, ks1[0].url)
}
@@
-921,7
+937,7
@@
func (s *StandaloneSuite) TestPutProxyInsufficientReplicas(c *C) {
_, replicas, err := kc.PutB([]byte("foo"))
<-st.handled
_, replicas, err := kc.PutB([]byte("foo"))
<-st.handled
- c.Check(err,
Equals, InsufficientReplicasError
)
+ c.Check(err,
FitsTypeOf, InsufficientReplicasError(errors.New(""))
)
c.Check(replicas, Equals, 2)
}
c.Check(replicas, Equals, 2)
}
@@
-996,7
+1012,7
@@
func (s *StandaloneSuite) TestPutBWant2ReplicasWithOnlyOneWritableLocalRoot(c *C
_, replicas, err := kc.PutB([]byte("foo"))
_, replicas, err := kc.PutB([]byte("foo"))
- c.Check(err,
Equals, InsufficientReplicasError
)
+ c.Check(err,
FitsTypeOf, InsufficientReplicasError(errors.New(""))
)
c.Check(replicas, Equals, 1)
c.Check(<-st.handled, Equals, localRoots[fmt.Sprintf("zzzzz-bi6l4-fakefakefake%03d", 0)])
c.Check(replicas, Equals, 1)
c.Check(<-st.handled, Equals, localRoots[fmt.Sprintf("zzzzz-bi6l4-fakefakefake%03d", 0)])
@@
-1031,7
+1047,7
@@
func (s *StandaloneSuite) TestPutBWithNoWritableLocalRoots(c *C) {
_, replicas, err := kc.PutB([]byte("foo"))
_, replicas, err := kc.PutB([]byte("foo"))
- c.Check(err,
Equals, InsufficientReplicasError
)
+ c.Check(err,
FitsTypeOf, InsufficientReplicasError(errors.New(""))
)
c.Check(replicas, Equals, 0)
}
c.Check(replicas, Equals, 0)
}
@@
-1065,12
+1081,14
@@
func (s *StandaloneSuite) TestGetIndexWithNoPrefix(c *C) {
defer ks.listener.Close()
arv, err := arvadosclient.MakeArvadosClient()
defer ks.listener.Close()
arv, err := arvadosclient.MakeArvadosClient()
- kc, _ := MakeKeepClient(arv)
+ c.Assert(err, IsNil)
+ kc, err := MakeKeepClient(arv)
+ c.Assert(err, IsNil)
arv.ApiToken = "abc123"
kc.SetServiceRoots(map[string]string{"x": ks.url}, nil, nil)
r, err := kc.GetIndex("x", "")
arv.ApiToken = "abc123"
kc.SetServiceRoots(map[string]string{"x": ks.url}, nil, nil)
r, err := kc.GetIndex("x", "")
- c.Check(err,
Equals, n
il)
+ c.Check(err,
IsN
il)
content, err2 := ioutil.ReadAll(r)
c.Check(err2, Equals, nil)
content, err2 := ioutil.ReadAll(r)
c.Check(err2, Equals, nil)
@@
-1096,7
+1114,7
@@
func (s *StandaloneSuite) TestGetIndexWithPrefix(c *C) {
kc.SetServiceRoots(map[string]string{"x": ks.url}, nil, nil)
r, err := kc.GetIndex("x", hash[0:3])
kc.SetServiceRoots(map[string]string{"x": ks.url}, nil, nil)
r, err := kc.GetIndex("x", hash[0:3])
- c.
Check
(err, Equals, nil)
+ c.
Assert
(err, Equals, nil)
content, err2 := ioutil.ReadAll(r)
c.Check(err2, Equals, nil)
content, err2 := ioutil.ReadAll(r)
c.Check(err2, Equals, nil)
@@
-1235,6
+1253,7
@@
func (s *ServerRequiredSuite) TestMakeKeepClientWithNonDiskTypeService(c *C) {
&blobKeepService)
c.Assert(err, Equals, nil)
defer func() { arv.Delete("keep_services", blobKeepService["uuid"].(string), nil, nil) }()
&blobKeepService)
c.Assert(err, Equals, nil)
defer func() { arv.Delete("keep_services", blobKeepService["uuid"].(string), nil, nil) }()
+ RefreshServiceDiscovery()
// Make a keepclient and ensure that the testblobstore is included
kc, err := MakeKeepClient(arv)
// Make a keepclient and ensure that the testblobstore is included
kc, err := MakeKeepClient(arv)
@@
-1263,5
+1282,5
@@
func (s *ServerRequiredSuite) TestMakeKeepClientWithNonDiskTypeService(c *C) {
c.Assert(kc.replicasPerService, Equals, 0)
c.Assert(kc.foundNonDiskSvc, Equals, true)
c.Assert(kc.replicasPerService, Equals, 0)
c.Assert(kc.foundNonDiskSvc, Equals, true)
- c.Assert(kc.
Client
.Timeout, Equals, 300*time.Second)
+ c.Assert(kc.
httpClient().(*http.Client)
.Timeout, Equals, 300*time.Second)
}
}