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 2c307e4df32a3c44e0944ba85b78f918dd29834f..7a930d58c8372ef9434310c4f0574b8c09eb2a00 100644 (file)
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -1,9 +1,6 @@
 package main
 
 import (
-       "crypto/tls"
-       "encoding/json"
-       "fmt"
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
@@ -13,7 +10,7 @@ import (
        "testing"
 )
 
-var keepClient keepclient.KeepClient
+var keepClient *keepclient.KeepClient
 
 type PullWorkIntegrationTestData struct {
        Name     string
@@ -25,34 +22,35 @@ 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()
 
+       // make arvadosclient
        arv, err := arvadosclient.MakeArvadosClient()
        if err != nil {
                t.Error("Error creating arv")
        }
 
-       servers := GetKeepServices(t)
+       // keep client
+       keepClient = &keepclient.KeepClient{
+               Arvados:       &arv,
+               Want_replicas: 1,
+               Using_proxy:   true,
+               Client:        &http.Client{},
+       }
 
-       random_token := GenerateRandomApiToken()
+       // 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)
+       }
 
        // Put content if the test needs it
        if wantData {
-               keepClient = keepclient.KeepClient{
-                       Arvados:       &arv,
-                       Want_replicas: 1,
-                       Using_proxy:   true,
-                       Client:        &http.Client{},
-               }
-               keepClient.Arvados.ApiToken = random_token
-
-               service_roots := make(map[string]string)
-               for _, addr := range servers {
-                       service_roots[addr] = addr
-               }
-               keepClient.SetServiceRoots(service_roots)
-
                locator, _, err := keepClient.PutB([]byte(testData.Content))
                if err != nil {
                        t.Errorf("Error putting test data in setup for %s %s %v", testData.Content, locator, err)
@@ -63,14 +61,6 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
        }
 
        // Create pullRequest for the test
-       keepClient = keepclient.KeepClient{
-               Arvados:       &arv,
-               Want_replicas: 1,
-               Using_proxy:   true,
-               Client:        &http.Client{},
-       }
-       keepClient.Arvados.ApiToken = random_token
-
        pullRequest := PullRequest{
                Locator: testData.Locator,
                Servers: servers,
@@ -78,64 +68,6 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
        return pullRequest
 }
 
-func GetKeepServices(t *testing.T) []string {
-       client := &http.Client{Transport: &http.Transport{
-               TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
-
-       req, err := http.NewRequest("GET", fmt.Sprintf("https://%s/arvados/v1/keep_services", os.Getenv("ARVADOS_API_HOST")), nil)
-       if err != nil {
-               t.Errorf("Error getting keep services: ", err)
-       }
-       req.Header.Set("Authorization", fmt.Sprintf("OAuth2 %s", os.Getenv("ARVADOS_API_TOKEN")))
-
-       resp, err := client.Do(req)
-       if err != nil {
-               t.Errorf("Error getting keep services: ", err)
-       }
-       if resp.StatusCode != 200 {
-               t.Errorf("Error status code getting keep services", resp.StatusCode)
-       }
-
-       defer resp.Body.Close()
-       var servers []string
-
-       decoder := json.NewDecoder(resp.Body)
-
-       var respJSON map[string]interface{}
-       err = decoder.Decode(&respJSON)
-       if err != nil {
-               t.Errorf("Error decoding response for keep services: ", err)
-       }
-
-       var service_names []string
-       var service_ports []string
-       for _, v1 := range respJSON {
-               switch v1_type := v1.(type) {
-               case []interface{}:
-                       for _, v2 := range v1_type {
-                               switch v2_type := v2.(type) {
-                               case map[string]interface{}:
-                                       for name, value := range v2_type {
-                                               if name == "service_host" {
-                                                       service_names = append(service_names, fmt.Sprintf("%s", value))
-                                               } else if name == "service_port" {
-                                                       service_ports = append(service_ports, strings.Split(fmt.Sprintf("%f", value), ".")[0])
-                                               }
-                                       }
-                               default:
-                               }
-                       }
-               default:
-               }
-       }
-
-       for i, port := range service_ports {
-               servers = append(servers, "http://"+service_names[i]+":"+port)
-       }
-
-       return servers
-}
-
 // 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) {
@@ -179,6 +111,7 @@ func performPullWorkerIntegrationTest(testData PullWorkIntegrationTestData, pull
                return
        }
 
+       keepClient.Arvados.ApiToken = GenerateRandomApiToken()
        err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
 
        if len(testData.GetError) > 0 {