projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14738: Enhances code readability when concatenating strings.
[arvados.git]
/
services
/
keepstore
/
pull_worker_integration_test.go
diff --git
a/services/keepstore/pull_worker_integration_test.go
b/services/keepstore/pull_worker_integration_test.go
index 8c7a1e222ddc8905041161cee67d605334285a65..231a4c0ab28097340f558c6179fd14d9d50b9d3f 100644
(file)
--- a/
services/keepstore/pull_worker_integration_test.go
+++ b/
services/keepstore/pull_worker_integration_test.go
@@
-1,3
+1,7
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
package main
import (
@@
-5,7
+9,6
@@
import (
"errors"
"io"
"io/ioutil"
"errors"
"io"
"io/ioutil"
- "net/http"
"os"
"strings"
"testing"
"os"
"strings"
"testing"
@@
-34,21
+37,19
@@
func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
// make arvadosclient
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
// make arvadosclient
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
- t.
Error("Error creating arv"
)
+ t.
Fatalf("Error creating arv: %s", err
)
}
// keep client
}
// keep client
- keepClient = &keepclient.KeepClient{
- Arvados: arv,
- Want_replicas: 1,
- Client: &http.Client{},
+ keepClient, err = keepclient.MakeKeepClient(arv)
+ if err != nil {
+ t.Fatalf("error creating KeepClient: %s", err)
}
}
+ keepClient.Want_replicas = 1
+ keepClient.RefreshServiceDiscovery()
// discover keep services
var servers []string
// discover keep services
var servers []string
- if err := keepClient.DiscoverKeepServers(); err != nil {
- t.Error("Error discovering keep services")
- }
for _, host := range keepClient.LocalRoots() {
servers = append(servers, host)
}
for _, host := range keepClient.LocalRoots() {
servers = append(servers, host)
}