X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/482dc81f2b7533043bc5195bded942f970f163d8..8a27fe370239ecb8e50d53f46b45ed61203a35ca:/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 77b4c75f4a..3855b4ecd3 100644 --- a/services/keepstore/pull_worker_integration_test.go +++ b/services/keepstore/pull_worker_integration_test.go @@ -1,19 +1,22 @@ -package main +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +package keepstore import ( "bytes" + "context" "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" + "io/ioutil" "strings" - "testing" -) -var keepClient *keepclient.KeepClient + "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/keepclient" + "github.com/prometheus/client_golang/prometheus" + check "gopkg.in/check.v1" +) type PullWorkIntegrationTestData struct { Name string @@ -22,57 +25,31 @@ type PullWorkIntegrationTestData struct { GetError string } -func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTestData, wantData bool) PullRequest { - os.Setenv("ARVADOS_API_HOST_INSECURE", "true") - - // start api and keep servers - arvadostest.StartAPI() +func (s *HandlerSuite) setupPullWorkerIntegrationTest(c *check.C, testData PullWorkIntegrationTestData, wantData bool) PullRequest { arvadostest.StartKeep(2, false) - - // make arvadosclient - arv, err := arvadosclient.MakeArvadosClient() - if err != nil { - t.Error("Error creating arv") - } - - // keep client - keepClient = &keepclient.KeepClient{ - Arvados: arv, - Want_replicas: 1, - Client: &http.Client{}, - } - - // 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) - } - + c.Assert(s.handler.setup(context.Background(), s.cluster, "", prometheus.NewRegistry(), testServiceURL), check.IsNil) // Put content if the test needs it if wantData { - locator, _, err := keepClient.PutB([]byte(testData.Content)) + locator, _, err := s.handler.keepClient.PutB([]byte(testData.Content)) if err != nil { - t.Errorf("Error putting test data in setup for %s %s %v", testData.Content, locator, err) + c.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") + c.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) { +func (s *HandlerSuite) TestPullWorkerIntegration_GetNonExistingLocator(c *check.C) { + c.Assert(s.handler.setup(context.Background(), s.cluster, "", prometheus.NewRegistry(), testServiceURL), check.IsNil) testData := PullWorkIntegrationTestData{ Name: "TestPullWorkerIntegration_GetLocator", Locator: "5d41402abc4b2a76b9719d911017c592", @@ -80,16 +57,16 @@ func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) { GetError: "Block not found", } - pullRequest := SetupPullWorkerIntegrationTest(t, testData, false) - defer arvadostest.StopAPI() + pullRequest := s.setupPullWorkerIntegrationTest(c, testData, false) defer arvadostest.StopKeep(2) - performPullWorkerIntegrationTest(testData, pullRequest, t) + s.performPullWorkerIntegrationTest(testData, pullRequest, c) } // 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) { +func (s *HandlerSuite) TestPullWorkerIntegration_GetExistingLocator(c *check.C) { + c.Assert(s.handler.setup(context.Background(), s.cluster, "", prometheus.NewRegistry(), testServiceURL), check.IsNil) testData := PullWorkIntegrationTestData{ Name: "TestPullWorkerIntegration_GetLocator", Locator: "5d41402abc4b2a76b9719d911017c592", @@ -97,50 +74,45 @@ func TestPullWorkerIntegration_GetExistingLocator(t *testing.T) { GetError: "", } - pullRequest := SetupPullWorkerIntegrationTest(t, testData, true) - defer arvadostest.StopAPI() + pullRequest := s.setupPullWorkerIntegrationTest(c, testData, true) defer arvadostest.StopKeep(2) - performPullWorkerIntegrationTest(testData, pullRequest, t) + s.performPullWorkerIntegrationTest(testData, pullRequest, c) } // 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) { +func (s *HandlerSuite) performPullWorkerIntegrationTest(testData PullWorkIntegrationTestData, pullRequest PullRequest, c *check.C) { - // 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 writePulledBlock to mock PutBlock functionality + defer func(orig func(*RRVolumeManager, Volume, []byte, string) error) { writePulledBlock = orig }(writePulledBlock) + writePulledBlock = func(_ *RRVolumeManager, _ Volume, content []byte, _ string) error { + c.Check(string(content), check.Equals, testData.Content) + return nil } // 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 := s.handler.pullItemAndProcess(pullRequest) if len(testData.GetError) > 0 { if (err == nil) || (!strings.Contains(err.Error(), testData.GetError)) { - t.Errorf("Got error %v, expected %v", err, testData.GetError) + c.Errorf("Got error %v, expected %v", err, testData.GetError) } } else { if err != nil { - t.Errorf("Got error %v, expected nil", err) + c.Errorf("Got error %v, expected nil", err) } } }