[ARVADOS] updated: b351a877ff2d708acc5fe577d5ed5cc9b0469dde

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go      |  2 +-
 services/crunch-run/crunchrun_test.go | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

       via  b351a877ff2d708acc5fe577d5ed5cc9b0469dde (commit)
      from  1a4a2f3219906220c0b4d7fd9b90325fa529408a (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 b351a877ff2d708acc5fe577d5ed5cc9b0469dde
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 31 10:17:23 2017 -0400

    9132: Fix test errors due to rebase.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index ad0a337..a05f61a 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -780,7 +780,7 @@ func (runner *ContainerRunner) WaitFinish() error {
 		return fmt.Errorf("container wait: %v", err)
 	}
 
-	runner.CrunchLog.Printf("container wait API status code: %v", waitDocker)
+	runner.CrunchLog.Printf("Container exited with code: %v", waitDocker)
 	code := int(waitDocker)
 	runner.ExitCode = &code
 
diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 5cd0d41..98462f8 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -683,11 +683,11 @@ func (s *TestSuite) TestNodeInfoLog(c *C) {
 		"output_path": "/tmp",
 		"priority": 1,
 		"runtime_constraints": {}
-	}`, nil, func(t *TestDockerClient) {
-		time.Sleep(time.Second)
-		t.logWriter.Close()
-		t.finish <- dockerclient.WaitResult{}
-	})
+	}`, nil, 0,
+		func(t *TestDockerClient) {
+			time.Sleep(time.Second)
+			t.logWriter.Close()
+		})
 
 	c.Check(api.CalledWith("container.exit_code", 0), NotNil)
 	c.Check(api.CalledWith("container.state", "Complete"), NotNil)
@@ -710,11 +710,11 @@ func (s *TestSuite) TestContainerRecordLog(c *C) {
 		"output_path": "/tmp",
 		"priority": 1,
 		"runtime_constraints": {}
-	}`, nil, func(t *TestDockerClient) {
-		time.Sleep(time.Second)
-		t.logWriter.Close()
-		t.finish <- dockerclient.WaitResult{}
-	})
+	}`, nil, 0,
+		func(t *TestDockerClient) {
+			time.Sleep(time.Second)
+			t.logWriter.Close()
+		})
 
 	c.Check(api.CalledWith("container.exit_code", 0), NotNil)
 	c.Check(api.CalledWith("container.state", "Complete"), NotNil)

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


hooks/post-receive
--