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"
- "net/http"
+ "bytes"
+ "errors"
+ "io"
+ "io/ioutil"
"os"
"strings"
"testing"
+
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
)
-var keepClient keepclient.KeepClient
+var keepClient *keepclient.KeepClient
type PullWorkIntegrationTestData struct {
Name string
}
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)
+ keepclient.RefreshServiceDiscovery()
+
+ // make arvadosclient
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
- t.Error("Error creating arv")
+ t.Fatalf("Error creating arv: %s", err)
}
- client := &http.Client{Transport: &http.Transport{
- TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
-
- keepClient = keepclient.KeepClient{
- Arvados: &arv,
- Want_replicas: 1,
- Using_proxy: true,
- Client: client,
- }
-
- random_token := GenerateRandomApiToken()
- keepClient.Arvados.ApiToken = random_token
-
+ // keep client
+ keepClient, err = keepclient.MakeKeepClient(arv)
if err != nil {
- t.Error("Error creating keepclient")
+ t.Fatalf("error creating KeepClient: %s", err)
}
+ keepClient.Want_replicas = 1
- 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
+ for _, host := range keepClient.LocalRoots() {
+ servers = append(servers, host)
}
- service_roots := make(map[string]string)
- for _, addr := range pullRequest.Servers {
- service_roots[addr] = addr
- }
- 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",
}
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",
}
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) {
- err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
+
+ // Override writePulledBlock to mock PutBlock functionality
+ defer func(orig func(Volume, []byte, string)) { writePulledBlock = orig }(writePulledBlock)
+ writePulledBlock = func(v Volume, content []byte, locator string) {
+ if string(content) != testData.Content {
+ t.Errorf("writePulledBlock invoked with unexpected data. Expected: %s; Found: %s", testData.Content, content)
+ }
+ }
+
+ // 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 := ioutil.NopCloser(bytes.NewBufferString(testData.Content))
+ return rdr, int64(len(testData.Content)), "", nil
+ }
+
+ err := PullItemAndProcess(pullRequest, 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)
+ }
}
}
projects / arvados.git / blobdiff