X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b22ff6242148a9b37baef6c74701fa85a8765adf..8a2c490a3905dc85a438ea92aa5b020a87d7b8b0:/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 8c7a1e222d..231a4c0ab2 100644 --- 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 ( @@ -5,7 +9,6 @@ import ( "errors" "io" "io/ioutil" - "net/http" "os" "strings" "testing" @@ -34,21 +37,19 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe // make arvadosclient arv, err := arvadosclient.MakeArvadosClient() if err != nil { - t.Error("Error creating arv") + t.Fatalf("Error creating arv: %s", err) } // 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 - if err := keepClient.DiscoverKeepServers(); err != nil { - t.Error("Error discovering keep services") - } for _, host := range keepClient.LocalRoots() { servers = append(servers, host) }