X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/88c382d13b3d6e6f3b03ba0d5139ad9552c3c359..fd419525e5a86b5aa7c9e4f7dd5b863dafe0d5d9:/services/crunch-run/crunchrun_test.go diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index 53cdbbc54e..9880230ce8 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" "git.curoverse.com/arvados.git/sdk/go/keepclient" "git.curoverse.com/arvados.git/sdk/go/manifest" @@ -18,6 +19,7 @@ import ( "os/exec" "sort" "strings" + "sync" "syscall" "testing" "time" @@ -36,10 +38,11 @@ var _ = Suite(&TestSuite{}) type ArvTestClient struct { Total int64 Calls int - Content arvadosclient.Dict - ContainerRecord + Content []arvadosclient.Dict + arvados.Container Logs map[string]*bytes.Buffer WasSetRunning bool + sync.Mutex } type KeepTestClient struct { @@ -54,6 +57,9 @@ var hwImageId = "9c31ee32b3d15268a0754e8edc74d4f815ee014b693bc5109058e431dd5caea var otherManifest = ". 68a84f561b1d1708c6baff5e019a9ab3+46+Ae5d0af96944a3690becb1decdf60cc1c937f556d@5693216f 0:46:md5sum.txt\n" var otherPDH = "a3e8f74c6f101eae01fa08bfb4e49b3a+54" +var fakeAuthUUID = "zzzzz-gj3su-55pqoyepgi2glem" +var fakeAuthToken = "a3ltuwzqcu2u4sc0q7yhpc2w7s00fdcqecg5d6e0u3pfohmbjt" + type TestDockerClient struct { imageLoaded string logReader io.ReadCloser @@ -126,61 +132,100 @@ func (*TestDockerClient) RemoveImage(name string, force bool) ([]*dockerclient.I return nil, nil } -func (this *ArvTestClient) Create(resourceType string, +func (client *ArvTestClient) Create(resourceType string, parameters arvadosclient.Dict, output interface{}) error { - this.Calls += 1 - this.Content = parameters + client.Mutex.Lock() + defer client.Mutex.Unlock() + + client.Calls += 1 + client.Content = append(client.Content, parameters) if resourceType == "logs" { et := parameters["log"].(arvadosclient.Dict)["event_type"].(string) - if this.Logs == nil { - this.Logs = make(map[string]*bytes.Buffer) + if client.Logs == nil { + client.Logs = make(map[string]*bytes.Buffer) } - if this.Logs[et] == nil { - this.Logs[et] = &bytes.Buffer{} + if client.Logs[et] == nil { + client.Logs[et] = &bytes.Buffer{} } - this.Logs[et].Write([]byte(parameters["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"])) + client.Logs[et].Write([]byte(parameters["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"])) } if resourceType == "collections" && output != nil { mt := parameters["collection"].(arvadosclient.Dict)["manifest_text"].(string) - outmap := output.(*CollectionRecord) + outmap := output.(*arvados.Collection) outmap.PortableDataHash = fmt.Sprintf("%x+%d", md5.Sum([]byte(mt)), len(mt)) } return nil } -func (this *ArvTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { +func (client *ArvTestClient) Call(method, resourceType, uuid, action string, parameters arvadosclient.Dict, output interface{}) error { + switch { + case method == "GET" && resourceType == "containers" && action == "auth": + return json.Unmarshal([]byte(`{ + "kind": "arvados#api_client_authorization", + "uuid": "`+fakeAuthUUID+`", + "api_token": "`+fakeAuthToken+`" + }`), output) + default: + return fmt.Errorf("Not found") + } +} + +func (client *ArvTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { if resourceType == "collections" { if uuid == hwPDH { - output.(*CollectionRecord).ManifestText = hwManifest + output.(*arvados.Collection).ManifestText = hwManifest } else if uuid == otherPDH { - output.(*CollectionRecord).ManifestText = otherManifest + output.(*arvados.Collection).ManifestText = otherManifest } } if resourceType == "containers" { - (*output.(*ContainerRecord)) = this.ContainerRecord + (*output.(*arvados.Container)) = client.Container } return nil } -func (this *ArvTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { - - this.Content = parameters +func (client *ArvTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { + client.Mutex.Lock() + defer client.Mutex.Unlock() + client.Calls += 1 + client.Content = append(client.Content, parameters) if resourceType == "containers" { if parameters["container"].(arvadosclient.Dict)["state"] == "Running" { - this.WasSetRunning = true + client.WasSetRunning = true } + } + return nil +} +// CalledWith returns the parameters from the first API call whose +// parameters match jpath/string. E.g., CalledWith(c, "foo.bar", +// "baz") returns parameters with parameters["foo"]["bar"]=="baz". If +// no call matches, it returns nil. +func (client *ArvTestClient) CalledWith(jpath, expect string) arvadosclient.Dict { +call: + for _, content := range client.Content { + var v interface{} = content + for _, k := range strings.Split(jpath, ".") { + if dict, ok := v.(arvadosclient.Dict); !ok { + continue call + } else { + v = dict[k] + } + } + if v, ok := v.(string); ok && v == expect { + return content + } } return nil } -func (this *KeepTestClient) PutHB(hash string, buf []byte) (string, int, error) { - this.Content = buf +func (client *KeepTestClient) PutHB(hash string, buf []byte) (string, int, error) { + client.Content = buf return fmt.Sprintf("%s+%d", hash, len(buf)), len(buf), nil } @@ -189,14 +234,14 @@ type FileWrapper struct { len uint64 } -func (this FileWrapper) Len() uint64 { - return this.len +func (fw FileWrapper) Len() uint64 { + return fw.len } -func (this *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { if filename == hwImageId+".tar" { rdr := ioutil.NopCloser(&bytes.Buffer{}) - this.Called = true + client.Called = true return FileWrapper{rdr, 1321984}, nil } return nil, nil @@ -212,7 +257,7 @@ func (s *TestSuite) TestLoadImage(c *C) { _, err = cr.Docker.InspectImage(hwImageId) c.Check(err, NotNil) - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH // (1) Test loading image from keep c.Check(kc.Called, Equals, false) @@ -243,57 +288,63 @@ func (s *TestSuite) TestLoadImage(c *C) { } type ArvErrorTestClient struct{} -type KeepErrorTestClient struct{} -type KeepReadErrorTestClient struct{} -func (this ArvErrorTestClient) Create(resourceType string, +func (ArvErrorTestClient) Create(resourceType string, parameters arvadosclient.Dict, output interface{}) error { return nil } -func (this ArvErrorTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { +func (ArvErrorTestClient) Call(method, resourceType, uuid, action string, parameters arvadosclient.Dict, output interface{}) error { return errors.New("ArvError") } -func (this ArvErrorTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { +func (ArvErrorTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { + return errors.New("ArvError") +} + +func (ArvErrorTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { return nil } -func (this KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { +type KeepErrorTestClient struct{} + +func (KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { return "", 0, errors.New("KeepError") } -func (this KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { return nil, errors.New("KeepError") } -func (this KeepReadErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { +type KeepReadErrorTestClient struct{} + +func (KeepReadErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { return "", 0, nil } type ErrorReader struct{} -func (this ErrorReader) Read(p []byte) (n int, err error) { +func (ErrorReader) Read(p []byte) (n int, err error) { return 0, errors.New("ErrorReader") } -func (this ErrorReader) Close() error { +func (ErrorReader) Close() error { return nil } -func (this ErrorReader) Len() uint64 { +func (ErrorReader) Len() uint64 { return 0 } -func (this KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { return ErrorReader{}, nil } func (s *TestSuite) TestLoadImageArvError(c *C) { // (1) Arvados error cr := NewContainerRunner(ArvErrorTestClient{}, &KeepTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err.Error(), Equals, "While getting container image collection: ArvError") @@ -303,7 +354,7 @@ func (s *TestSuite) TestLoadImageKeepError(c *C) { // (2) Keep error docker := NewTestDockerClient() cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err.Error(), Equals, "While creating ManifestFileReader for container image: KeepError") @@ -312,7 +363,7 @@ func (s *TestSuite) TestLoadImageKeepError(c *C) { func (s *TestSuite) TestLoadImageCollectionError(c *C) { // (3) Collection doesn't contain image cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = otherPDH + cr.Container.ContainerImage = otherPDH err := cr.LoadImage() c.Check(err.Error(), Equals, "First file in the container image collection does not end in .tar") @@ -322,7 +373,7 @@ func (s *TestSuite) TestLoadImageKeepReadError(c *C) { // (4) Collection doesn't contain image docker := NewTestDockerClient() cr := NewContainerRunner(&ArvTestClient{}, KeepReadErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err, NotNil) @@ -332,21 +383,21 @@ type ClosableBuffer struct { bytes.Buffer } +func (*ClosableBuffer) Close() error { + return nil +} + type TestLogs struct { Stdout ClosableBuffer Stderr ClosableBuffer } -func (this *ClosableBuffer) Close() error { - return nil -} - -func (this *TestLogs) NewTestLoggingWriter(logstr string) io.WriteCloser { +func (tl *TestLogs) NewTestLoggingWriter(logstr string) io.WriteCloser { if logstr == "stdout" { - return &this.Stdout + return &tl.Stdout } if logstr == "stderr" { - return &this.Stderr + return &tl.Stderr } return nil } @@ -371,11 +422,14 @@ func (s *TestSuite) TestRunContainer(c *C) { var logs TestLogs cr.NewLogWriter = logs.NewTestLoggingWriter - cr.ContainerRecord.ContainerImage = hwPDH - cr.ContainerRecord.Command = []string{"./hw"} + cr.Container.ContainerImage = hwPDH + cr.Container.Command = []string{"./hw"} err := cr.LoadImage() c.Check(err, IsNil) + err = cr.CreateContainer() + c.Check(err, IsNil) + err = cr.StartContainer() c.Check(err, IsNil) @@ -399,23 +453,24 @@ func (s *TestSuite) TestCommitLogs(c *C) { err := cr.CommitLogs() c.Check(err, IsNil) - c.Check(api.Content["collection"].(arvadosclient.Dict)["name"], Equals, "logs for zzzzz-zzzzz-zzzzzzzzzzzzzzz") - c.Check(api.Content["collection"].(arvadosclient.Dict)["manifest_text"], Equals, ". 744b2e4553123b02fa7b452ec5c18993+123 0:123:crunch-run.txt\n") + c.Check(api.Calls, Equals, 2) + c.Check(api.Content[1]["collection"].(arvadosclient.Dict)["name"], Equals, "logs for zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Check(api.Content[1]["collection"].(arvadosclient.Dict)["manifest_text"], Equals, ". 744b2e4553123b02fa7b452ec5c18993+123 0:123:crunch-run.txt\n") c.Check(*cr.LogsPDH, Equals, "63da7bdacf08c40f604daad80c261e9a+60") } -func (s *TestSuite) TestUpdateContainerRecordRunning(c *C) { +func (s *TestSuite) TestUpdateContainerRunning(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - err := cr.UpdateContainerRecordRunning() + err := cr.UpdateContainerRunning() c.Check(err, IsNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Running") + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Running") } -func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) { +func (s *TestSuite) TestUpdateContainerComplete(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") @@ -427,41 +482,41 @@ func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) { *cr.ExitCode = 42 cr.finalState = "Complete" - err := cr.UpdateContainerRecordComplete() + err := cr.UpdateContainerFinal() c.Check(err, IsNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, *cr.ExitCode) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["exit_code"], Equals, *cr.ExitCode) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") } -func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) { +func (s *TestSuite) TestUpdateContainerCancelled(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") cr.Cancelled = true cr.finalState = "Cancelled" - err := cr.UpdateContainerRecordComplete() + err := cr.UpdateContainerFinal() c.Check(err, IsNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["log"], IsNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], IsNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], IsNil) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["exit_code"], IsNil) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") } // Used by the TestFullRun*() test below to DRY up boilerplate setup to do full -// dress rehersal of the Run() function, starting from a JSON container record. +// dress rehearsal of the Run() function, starting from a JSON container record. func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner) { - rec := ContainerRecord{} - err := json.NewDecoder(strings.NewReader(record)).Decode(&rec) + rec := arvados.Container{} + err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) docker := NewTestDockerClient() docker.fn = fn docker.RemoveImage(hwImageId, true) - api = &ArvTestClient{ContainerRecord: rec} + api = &ArvTestClient{Container: rec} cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest @@ -470,7 +525,7 @@ func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvT c.Check(err, IsNil) c.Check(api.WasSetRunning, Equals, true) - c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil) + c.Check(api.Content[api.Calls-1]["container"].(arvadosclient.Dict)["log"], NotNil) if err != nil { for k, v := range api.Logs { @@ -498,8 +553,9 @@ func (s *TestSuite) TestFullRunHello(c *C) { t.finish <- dockerclient.WaitResult{} }) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello world\n"), Equals, true) @@ -522,9 +578,10 @@ func (s *TestSuite) TestFullRunStderr(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 1} }) - c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 1) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Assert(api.Calls, Equals, 8) + c.Check(api.Content[7]["container"].(arvadosclient.Dict)["log"], NotNil) + c.Check(api.Content[7]["container"].(arvadosclient.Dict)["exit_code"], Equals, 1) + c.Check(api.Content[7]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello\n"), Equals, true) c.Check(strings.HasSuffix(api.Logs["stderr"].String(), "world\n"), Equals, true) @@ -546,8 +603,9 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") log.Print(api.Logs["stdout"].String()) @@ -570,8 +628,9 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/bin\n"), Equals, true) } @@ -588,8 +647,8 @@ func (s *TestSuite) TestCancel(c *C) { "runtime_constraints": {} }` - rec := ContainerRecord{} - err := json.NewDecoder(strings.NewReader(record)).Decode(&rec) + rec := arvados.Container{} + err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) docker := NewTestDockerClient() @@ -601,14 +660,14 @@ func (s *TestSuite) TestCancel(c *C) { } docker.RemoveImage(hwImageId, true) - api := &ArvTestClient{ContainerRecord: rec} + api := &ArvTestClient{Container: rec} cr := NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest go func() { for cr.ContainerID == "" { - time.Sleep(1 * time.Second) + time.Sleep(time.Millisecond) } cr.SigChan <- syscall.SIGINT }() @@ -616,9 +675,6 @@ func (s *TestSuite) TestCancel(c *C) { err = cr.Run() c.Check(err, IsNil) - - c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil) - if err != nil { for k, v := range api.Logs { c.Log(k) @@ -626,8 +682,9 @@ func (s *TestSuite) TestCancel(c *C) { } } - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") - + c.Assert(api.Calls, Equals, 6) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["log"], IsNil) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true) } @@ -648,18 +705,21 @@ func (s *TestSuite) TestFullRunSetEnv(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "bilbo\n"), Equals, true) } type ArvMountCmdLine struct { - Cmd []string + Cmd []string + token string } -func (am *ArvMountCmdLine) ArvMountTest(c []string) (*exec.Cmd, error) { +func (am *ArvMountCmdLine) ArvMountTest(c []string, token string) (*exec.Cmd, error) { am.Cmd = c + am.token = token return nil, nil } @@ -679,8 +739,8 @@ func (s *TestSuite) TestSetupMounts(c *C) { } { - cr.ContainerRecord.Mounts = make(map[string]Mount) - cr.ContainerRecord.Mounts["/tmp"] = Mount{Kind: "tmp"} + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"} cr.OutputPath = "/tmp" err := cr.SetupMounts() @@ -692,8 +752,8 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 - cr.ContainerRecord.Mounts = make(map[string]Mount) - cr.ContainerRecord.Mounts["/keeptmp"] = Mount{Kind: "collection", Writable: true} + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts["/keeptmp"] = arvados.Mount{Kind: "collection", Writable: true} cr.OutputPath = "/keeptmp" os.MkdirAll("/tmp/mktmpdir1/tmp0", os.ModePerm) @@ -707,9 +767,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 - cr.ContainerRecord.Mounts = make(map[string]Mount) - cr.ContainerRecord.Mounts["/keepinp"] = Mount{Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"} - cr.ContainerRecord.Mounts["/keepout"] = Mount{Kind: "collection", Writable: true} + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts["/keepinp"] = arvados.Mount{Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"} + cr.Container.Mounts["/keepout"] = arvados.Mount{Kind: "collection", Writable: true} cr.OutputPath = "/keepout" os.MkdirAll("/tmp/mktmpdir1/by_id/59389a8f9ee9d399be35462a0f92541c+53", os.ModePerm) @@ -725,3 +785,76 @@ func (s *TestSuite) TestSetupMounts(c *C) { cr.CleanupDirs() } } + +func (s *TestSuite) TestStdout(c *C) { + helperRecord := `{` + helperRecord += `"command": ["/bin/sh", "-c", "echo $FROBIZ"],` + helperRecord += `"container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",` + helperRecord += `"cwd": "/bin",` + helperRecord += `"environment": {"FROBIZ": "bilbo"},` + helperRecord += `"mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} },` + helperRecord += `"output_path": "/tmp",` + helperRecord += `"priority": 1,` + helperRecord += `"runtime_constraints": {}` + helperRecord += `}` + + api, _ := FullRunHelper(c, helperRecord, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) + t.logWriter.Close() + t.finish <- dockerclient.WaitResult{ExitCode: 0} + }) + + c.Assert(api.Calls, Equals, 6) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.CalledWith("collection.manifest_text", "./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out\n"), Not(IsNil)) +} + +// Used by the TestStdoutWithWrongPath*() +func StdoutErrorRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, err error) { + rec := arvados.Container{} + err = json.Unmarshal([]byte(record), &rec) + c.Check(err, IsNil) + + docker := NewTestDockerClient() + docker.fn = fn + docker.RemoveImage(hwImageId, true) + + api = &ArvTestClient{Container: rec} + cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + am := &ArvMountCmdLine{} + cr.RunArvMount = am.ArvMountTest + + err = cr.Run() + return +} + +func (s *TestSuite) TestStdoutWithWrongPath(c *C) { + _, _, err := StdoutErrorRunHelper(c, `{ + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "file", "path":"/tmpa.out"} }, + "output_path": "/tmp" +}`, func(t *TestDockerClient) {}) + + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "Stdout path does not start with OutputPath"), Equals, true) +} + +func (s *TestSuite) TestStdoutWithWrongKindTmp(c *C) { + _, _, err := StdoutErrorRunHelper(c, `{ + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "tmp", "path":"/tmp/a.out"} }, + "output_path": "/tmp" +}`, func(t *TestDockerClient) {}) + + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "Unsupported mount kind 'tmp' for stdout"), Equals, true) +} + +func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) { + _, _, err := StdoutErrorRunHelper(c, `{ + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "collection", "path":"/tmp/a.out"} }, + "output_path": "/tmp" +}`, func(t *TestDockerClient) {}) + + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "Unsupported mount kind 'collection' for stdout"), Equals, true) +}