X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2ae40cbbb77f0843662628732b9ca7679a369749..7a53cfc92d4bca452a687db0a6f338e6deb1564a:/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 b25d0ab04c..77b4c75f4a 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -1,17 +1,19 @@
 package main
 
 import (
-	"crypto/tls"
+	"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"
 	"os"
 	"strings"
 	"testing"
 )
 
-var keepClient keepclient.KeepClient
+var keepClient *keepclient.KeepClient
 
 type PullWorkIntegrationTestData struct {
 	Name     string
@@ -21,55 +23,55 @@ type PullWorkIntegrationTestData struct {
 }
 
 func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTestData, wantData bool) PullRequest {
-	arvadostest.StartAPI()
-	arvadostest.StartKeep()
-
 	os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
 
+	// start api and keep servers
+	arvadostest.StartAPI()
+	arvadostest.StartKeep(2, false)
+
+	// make arvadosclient
 	arv, err := arvadosclient.MakeArvadosClient()
 	if err != nil {
 		t.Error("Error creating arv")
 	}
 
-	client := &http.Client{Transport: &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
-
-	keepClient = keepclient.KeepClient{
-		Arvados:       &arv,
+	// keep client
+	keepClient = &keepclient.KeepClient{
+		Arvados:       arv,
 		Want_replicas: 1,
-		Using_proxy:   true,
-		Client:        client,
-	}
-
-	random_token := GenerateRandomApiToken()
-	keepClient.Arvados.ApiToken = random_token
-
-	if err != nil {
-		t.Error("Error creating keepclient")
+		Client:        &http.Client{},
 	}
 
-	servers := make([]string, 1)
-	servers[0] = "https://" + os.Getenv("ARVADOS_API_HOST")
-	pullRequest := PullRequest{
-		Locator: testData.Locator,
-		Servers: servers,
+	// discover keep services
+	var servers []string
+	if err := keepClient.DiscoverKeepServers(); err != nil {
+		t.Error("Error discovering keep services")
 	}
-
-	service_roots := make(map[string]string)
-	for _, addr := range pullRequest.Servers {
-		service_roots[addr] = addr
+	for _, host := range keepClient.LocalRoots() {
+		servers = append(servers, host)
 	}
-	keepClient.SetServiceRoots(service_roots)
 
+	// Put content if the test needs it
 	if wantData {
 		locator, _, err := keepClient.PutB([]byte(testData.Content))
 		if err != nil {
-			t.Errorf("Error putting test data in setup for %s %s", testData.Content, locator)
+			t.Errorf("Error putting test data in setup for %s %s %v", testData.Content, locator, err)
+		}
+		if locator == "" {
+			t.Errorf("No locator found after putting test data")
 		}
 	}
+
+	// Create pullRequest for the test
+	pullRequest := PullRequest{
+		Locator: testData.Locator,
+		Servers: servers,
+	}
 	return pullRequest
 }
 
+// Do a get on a block that is not existing in any of the keep servers.
+// Expect "block not found" error.
 func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) {
 	testData := PullWorkIntegrationTestData{
 		Name:     "TestPullWorkerIntegration_GetLocator",
@@ -79,10 +81,14 @@ func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) {
 	}
 
 	pullRequest := SetupPullWorkerIntegrationTest(t, testData, false)
+	defer arvadostest.StopAPI()
+	defer arvadostest.StopKeep(2)
 
 	performPullWorkerIntegrationTest(testData, pullRequest, t)
 }
 
+// Do a get on a block that exists on one of the keep servers.
+// The setup method will create this block before doing the get.
 func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) {
 	testData := PullWorkIntegrationTestData{
 		Name:     "TestPullWorkerIntegration_GetLocator",
@@ -92,24 +98,49 @@ func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) {
 	}
 
 	pullRequest := SetupPullWorkerIntegrationTest(t, testData, true)
+	defer arvadostest.StopAPI()
+	defer arvadostest.StopKeep(2)
 
 	performPullWorkerIntegrationTest(testData, pullRequest, t)
 }
 
+// Perform the test.
+// The test directly invokes the "PullItemAndProcess" rather than
+// 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) {
+		if string(content) != testData.Content {
+			t.Errorf("PutContent 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) {
+		if testData.GetError != "" {
+			return nil, 0, "", errors.New(testData.GetError)
+		}
+		rdr := &ClosingBuffer{bytes.NewBufferString(testData.Content)}
+		return rdr, int64(len(testData.Content)), "", nil
+	}
+
+	keepClient.Arvados.ApiToken = GenerateRandomAPIToken()
 	err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
 
 	if len(testData.GetError) > 0 {
 		if (err == nil) || (!strings.Contains(err.Error(), testData.GetError)) {
-			t.Fail()
+			t.Errorf("Got error %v, expected %v", err, testData.GetError)
 		}
 	} else {
-		t.Fail()
-	}
-
-	// Override PutContent to mock PutBlock functionality
-	PutContent = func(content []byte, locator string) (err error) {
-		// do nothing
-		return
+		if err != nil {
+			t.Errorf("Got error %v, expected nil", err)
+		}
 	}
 }