Merge branch 'master' into 7490-datamanager-dont-die-return-error

[arvados.git] / services / datamanager / datamanager_test.go

diff --git a/services/datamanager/datamanager_test.go b/services/datamanager/datamanager_test.go
index 685f94c88f3a35c33f6aa986e85701a5853e5d32..26a2fbf92ba124c8cbe4e534c39931107f084dca 100644 (file)
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@ -28,7 +28,11 @@ func SetupDataManagerTest(t *testing.T) {
        arvadostest.StartAPI()
        arvadostest.StartKeep(2, false)
 
-       arv = makeArvadosClient()
+       var err error
+       arv, err = makeArvadosClient()
+       if err != nil {
+               t.Fatalf("Error making arvados client: %s", err)
+       }
        arv.ApiToken = arvadostest.DataManagerToken
 
        // keep client
@@ -40,7 +44,7 @@ func SetupDataManagerTest(t *testing.T) {
        }
 
        // discover keep services
-       if err := keepClient.DiscoverKeepServers(); err != nil {
+       if err = keepClient.DiscoverKeepServers(); err != nil {
                t.Fatalf("Error discovering keep services: %s", err)
        }
        keepServers = []string{}