X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a9e08c498ac8126026d1226f34913f87c8e590a0..fb6909efa81aa96af7e4bf5b29438de1e21b3068:/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 3a3069ab77..231a4c0ab2 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -1,16 +1,21 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"bytes"
 	"errors"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 	"io"
-	"net/http"
+	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
+
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 )
 
 var keepClient *keepclient.KeepClient
@@ -32,22 +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,
-		Using_proxy:   true,
-		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)
 	}
@@ -82,6 +84,8 @@ func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) {
 	}
 
 	pullRequest := SetupPullWorkerIntegrationTest(t, testData, false)
+	defer arvadostest.StopAPI()
+	defer arvadostest.StopKeep(2)
 
 	performPullWorkerIntegrationTest(testData, pullRequest, t)
 }
@@ -97,6 +101,8 @@ func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) {
 	}
 
 	pullRequest := SetupPullWorkerIntegrationTest(t, testData, true)
+	defer arvadostest.StopAPI()
+	defer arvadostest.StopKeep(2)
 
 	performPullWorkerIntegrationTest(testData, pullRequest, t)
 }
@@ -106,30 +112,27 @@ func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) {
 // putting an item on the pullq so that the errors can be verified.
 func performPullWorkerIntegrationTest(testData PullWorkIntegrationTestData, pullRequest PullRequest, t *testing.T) {
 
-	// Override PutContent to mock PutBlock functionality
-	defer func(orig func([]byte, string) error) { PutContent = orig }(PutContent)
-	PutContent = func(content []byte, locator string) (err error) {
+	// Override writePulledBlock to mock PutBlock functionality
+	defer func(orig func(Volume, []byte, string)) { writePulledBlock = orig }(writePulledBlock)
+	writePulledBlock = func(v Volume, content []byte, locator string) {
 		if string(content) != testData.Content {
-			t.Errorf("PutContent invoked with unexpected data. Expected: %s; Found: %s", testData.Content, content)
+			t.Errorf("writePulledBlock invoked with unexpected data. Expected: %s; Found: %s", testData.Content, content)
 		}
-		return
 	}
 
 	// Override GetContent to mock keepclient Get functionality
 	defer func(orig func(string, *keepclient.KeepClient) (io.ReadCloser, int64, string, error)) {
 		GetContent = orig
 	}(GetContent)
-	GetContent = func(signedLocator string, keepClient *keepclient.KeepClient) (
-		reader io.ReadCloser, contentLength int64, url string, err error) {
+	GetContent = func(signedLocator string, keepClient *keepclient.KeepClient) (reader io.ReadCloser, contentLength int64, url string, err error) {
 		if testData.GetError != "" {
 			return nil, 0, "", errors.New(testData.GetError)
 		}
-		rdr := &ClosingBuffer{bytes.NewBufferString(testData.Content)}
+		rdr := ioutil.NopCloser(bytes.NewBufferString(testData.Content))
 		return rdr, int64(len(testData.Content)), "", nil
 	}
 
-	keepClient.Arvados.ApiToken = GenerateRandomAPIToken()
-	err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
+	err := PullItemAndProcess(pullRequest, keepClient)
 
 	if len(testData.GetError) > 0 {
 		if (err == nil) || (!strings.Contains(err.Error(), testData.GetError)) {