5562: Use static method. Fixes "TypeError: _socket_open() takes exactly 5 arguments...

[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 b25d0ab04c67b1d816292eb41257a883cddab67e..7a930d58c8372ef9434310c4f0574b8c09eb2a00 100644 (file)
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-       "crypto/tls"
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
@@ -11,7 +10,7 @@ import (
        "testing"
 )
 
-var keepClient keepclient.KeepClient
+var keepClient *keepclient.KeepClient
 
 type PullWorkIntegrationTestData struct {
        Name     string
@@ -21,55 +20,56 @@ type PullWorkIntegrationTestData struct {
 }
 
 func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTestData, wantData bool) PullRequest {
+       os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
+
+       // start api and keep servers
        arvadostest.StartAPI()
        arvadostest.StartKeep()
 
-       os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
-
+       // 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{
+       // keep client
+       keepClient = &keepclient.KeepClient{
                Arvados:       &arv,
                Want_replicas: 1,
                Using_proxy:   true,
-               Client:        client,
+               Client:        &http.Client{},
        }
 
-       random_token := GenerateRandomApiToken()
-       keepClient.Arvados.ApiToken = random_token
-
-       if err != nil {
-               t.Error("Error creating keepclient")
+       // discover keep services
+       var servers []string
+       if err := keepClient.DiscoverKeepServers(); err != nil {
+               t.Error("Error discovering keep services")
        }
-
-       servers := make([]string, 1)
-       servers[0] = "https://" + os.Getenv("ARVADOS_API_HOST")
-       pullRequest := PullRequest{
-               Locator: testData.Locator,
-               Servers: servers,
-       }
-
-       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",
@@ -83,6 +83,8 @@ func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) {
        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",
@@ -96,20 +98,29 @@ func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) {
        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
+       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
+       }
+
+       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", err)
                }
        } 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", err)
+               }
        }
 }