X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cac5db66cba0d5dd97c8434853bcbf2ab19fbda5..c217491f9fdc78bd1c665618137c053a852599ac:/services/crunch-run/crunchrun_test.go diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index 53cdbbc54e..a58fae0369 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -36,7 +36,7 @@ var _ = Suite(&TestSuite{}) type ArvTestClient struct { Total int64 Calls int - Content arvadosclient.Dict + Content []arvadosclient.Dict ContainerRecord Logs map[string]*bytes.Buffer WasSetRunning bool @@ -131,7 +131,7 @@ func (this *ArvTestClient) Create(resourceType string, output interface{}) error { this.Calls += 1 - this.Content = parameters + this.Content = append(this.Content, parameters) if resourceType == "logs" { et := parameters["log"].(arvadosclient.Dict)["event_type"].(string) @@ -168,8 +168,8 @@ func (this *ArvTestClient) Get(resourceType string, uuid string, parameters arva } func (this *ArvTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { - - this.Content = parameters + this.Calls += 1 + this.Content = append(this.Content, parameters) if resourceType == "containers" { if parameters["container"].(arvadosclient.Dict)["state"] == "Running" { this.WasSetRunning = true @@ -399,8 +399,9 @@ 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") } @@ -412,7 +413,7 @@ func (s *TestSuite) TestUpdateContainerRecordRunning(c *C) { err := cr.UpdateContainerRecordRunning() 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) { @@ -430,9 +431,9 @@ func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) { err := cr.UpdateContainerRecordComplete() 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) { @@ -445,13 +446,13 @@ func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) { err := cr.UpdateContainerRecordComplete() 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) @@ -470,7 +471,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 +499,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 +524,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 +549,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 +574,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) } @@ -617,7 +622,8 @@ func (s *TestSuite) TestCancel(c *C) { c.Check(err, IsNil) - c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil) + c.Check(api.Calls, Equals, 6) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["log"], NotNil) if err != nil { for k, v := range api.Logs { @@ -626,7 +632,7 @@ func (s *TestSuite) TestCancel(c *C) { } } - c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true) @@ -648,8 +654,9 @@ 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) } @@ -725,3 +732,105 @@ func (s *TestSuite) TestSetupMounts(c *C) { cr.CleanupDirs() } } + +func (s *TestSuite) TestStdout(c *C) { + tmpdir, _ := ioutil.TempDir("", "test-stdout") + defer func() { + os.RemoveAll(tmpdir) + }() + + helperRecord := `{` + helperRecord += `"command": ["/bin/sh", "-c", "echo $FROBIZ"],` + helperRecord += `"container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",` + helperRecord += `"cwd": "/bin",` + helperRecord += `"environment": {"FROBIZ": "bilbo"},` + helperRecord += `"mounts": {"stdout": {"kind": "file", "path": "` + tmpdir + `/a/b/c.out"} },` + helperRecord += `"output_path": "` + tmpdir + `",` + helperRecord += `"priority": 1,` + helperRecord += `"runtime_constraints": {}` + helperRecord += `}` + + api, cr := 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.Check(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") + stdout := cr.HostOutputDir + "/a/b/c.out" + data, err := ioutil.ReadFile(stdout) + c.Check(err, IsNil) + c.Check("bilbo\n", Equals, string(data)) +} + +// Used by the TestStdoutWithWrongPath*() +func StdoutErrorRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, err error) { + rec := ContainerRecord{} + err = json.NewDecoder(strings.NewReader(record)).Decode(&rec) + c.Check(err, IsNil) + + docker := NewTestDockerClient() + docker.fn = fn + docker.RemoveImage(hwImageId, true) + + api = &ArvTestClient{ContainerRecord: 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) +} + +func (s *TestSuite) TestStdoutNoSuchDir(c *C) { + tmpdir, _ := ioutil.TempDir("", "test-stdout") + defer func() { + os.RemoveAll(tmpdir) + }() + + helperRecord := `{` + helperRecord += `"command": ["/bin/sh", "-c", "echo $FROBIZ"],` + helperRecord += `"container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",` + helperRecord += `"cwd": "/bin",` + helperRecord += `"environment": {"FROBIZ": "bilbo"},` + helperRecord += `"mounts": {"stdout": {"kind": "file", "path": "` + tmpdir + `/nosuchsubdir/a/b/c.out"} },` + helperRecord += `"output_path": "` + tmpdir + `/nosuchsubdir",` + helperRecord += `"priority": 1,` + helperRecord += `"runtime_constraints": {}` + helperRecord += `}` + + _, _, err := StdoutErrorRunHelper(c, helperRecord, func(t *TestDockerClient) {}) + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "/nosuchsubdir: no such file or directory"), Equals, true) +}