X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/edc5c5d88db4f9584db8b8a4ec24e9307ec45244..17014a715c21dd85a02c34b807b8c362c8706cf1:/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 49443808fd..b293cf92ea 100644 --- 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" @@ -25,38 +22,47 @@ 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 + service_roots, err := keepClient.DiscoverKeepServers() + if err != nil { + t.Error("Error discovering keep services") + } + for _, host := range service_roots { + servers = append(servers, host) + } // Put content if the test needs it if wantData { - CreateKeepClient(arv, random_token) - 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) } + if locator == "" { + t.Errorf("No locator found after putting test data") + } } // Create pullRequest for the test - CreateKeepClient(arv, random_token) - pullRequest := PullRequest{ Locator: testData.Locator, Servers: servers, @@ -64,77 +70,8 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe return pullRequest } -func CreateKeepClient(arv arvadosclient.ArvadosClient, random_token string) { - client := &http.Client{Transport: &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}} - - keepClient = keepclient.KeepClient{ - Arvados: &arv, - Want_replicas: 1, - Using_proxy: true, - Client: client, - } - keepClient.Arvados.ApiToken = random_token -} - -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, "https://"+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) { testData := PullWorkIntegrationTestData{ Name: "TestPullWorkerIntegration_GetLocator", @@ -148,6 +85,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", @@ -161,19 +100,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() + if err != nil { + t.Errorf("Got error %v", err) + } } }