[ARVADOS] updated: 9290528fb9700db4541ebe29c94eda3503f509f4

[Git user]

Summary of changes:
 services/crunch-run/crunchrun_test.go | 48 +++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

       via  9290528fb9700db4541ebe29c94eda3503f509f4 (commit)
      from  e14484fbba64222e4b32c353e3ea057c6f10acd0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9290528fb9700db4541ebe29c94eda3503f509f4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 20 21:38:28 2016 -0400

    10172: Add test for API: true and container setting output.

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 0ce6587..41b0e96 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -69,6 +69,7 @@ type TestDockerClient struct {
 	stop        chan bool
 	cwd         string
 	env         []string
+	api         *ArvTestClient
 }
 
 func NewTestDockerClient() *TestDockerClient {
@@ -527,6 +528,7 @@ func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvT
 	docker.RemoveImage(hwImageId, true)
 
 	api = &ArvTestClient{Container: rec}
+	docker.api = api
 	cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz")
 	cr.statInterval = 100 * time.Millisecond
 	am := &ArvMountCmdLine{}
@@ -935,3 +937,49 @@ func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) {
 	c.Check(err, NotNil)
 	c.Check(strings.Contains(err.Error(), "Unsupported mount kind 'collection' for stdout"), Equals, true)
 }
+
+func (s *TestSuite) TestFullRunWithAPI(c *C) {
+	os.Setenv("ARVADOS_API_HOST", "test.arvados.org")
+	defer os.Unsetenv("ARVADOS_API_HOST")
+	api, _ := FullRunHelper(c, `{
+    "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"],
+    "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",
+    "cwd": "/bin",
+    "environment": {},
+    "mounts": {"/tmp": {"kind": "tmp"} },
+    "output_path": "/tmp",
+    "priority": 1,
+    "runtime_constraints": {"API": true}
+}`, func(t *TestDockerClient) {
+		t.logWriter.Write(dockerLog(1, t.env[1][17:]+"\n"))
+		t.logWriter.Close()
+		t.finish <- dockerclient.WaitResult{ExitCode: 0}
+	})
+
+	c.Check(api.CalledWith("container.exit_code", 0), NotNil)
+	c.Check(api.CalledWith("container.state", "Complete"), NotNil)
+	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "test.arvados.org\n"), Equals, true)
+}
+
+func (s *TestSuite) TestFullRunSetOutput(c *C) {
+	os.Setenv("ARVADOS_API_HOST", "test.arvados.org")
+	defer os.Unsetenv("ARVADOS_API_HOST")
+	api, _ := FullRunHelper(c, `{
+    "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"],
+    "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",
+    "cwd": "/bin",
+    "environment": {},
+    "mounts": {"/tmp": {"kind": "tmp"} },
+    "output_path": "/tmp",
+    "priority": 1,
+    "runtime_constraints": {"API": true}
+}`, func(t *TestDockerClient) {
+		t.api.Container.Output = "d4ab34d3d4f8a72f5c4973051ae69fab+122"
+		t.logWriter.Close()
+		t.finish <- dockerclient.WaitResult{ExitCode: 0}
+	})
+
+	c.Check(api.CalledWith("container.exit_code", 0), NotNil)
+	c.Check(api.CalledWith("container.state", "Complete"), NotNil)
+	c.Check(api.CalledWith("container.output", "d4ab34d3d4f8a72f5c4973051ae69fab+122"), NotNil)
+}

-----------------------------------------------------------------------


hooks/post-receive
--