[ARVADOS] updated: 1.1.0-193-ga7bbcab

[Git user]

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

       via  a7bbcabfeb74bd61ca92078a0a49caeab01e08bc (commit)
      from  ce911bd75fb998c2ac1d88a67db55f7f0e362752 (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 a7bbcabfeb74bd61ca92078a0a49caeab01e08bc
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Nov 28 16:40:20 2017 -0500

    12614: Fix tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 6581c6b..bcf9704 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -1769,6 +1769,9 @@ func (s *TestSuite) TestEvalSymlinkDir(c *C) {
 }
 
 func (s *TestSuite) TestFullBrokenDocker1(c *C) {
+	ech := "/bin/echo"
+	brokenNodeHook = &ech
+
 	api, _, _ := FullRunHelper(c, `{
     "command": ["echo", "hello world"],
     "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",
@@ -1783,16 +1786,16 @@ func (s *TestSuite) TestFullBrokenDocker1(c *C) {
 		t.logWriter.Close()
 	})
 
-	ech := "/bin/echo"
-	brokenNodeHook = &ech
-
 	c.Check(api.CalledWith("container.state", "Queued"), NotNil)
 	c.Check(strings.Index(api.Logs["crunch-run"].String(), "unable to run containers"), Not(Equals), -1)
-	c.Check(strings.Index(api.Logs["crunch-run"].String(), "Running broken node hook '/bin/echo'"), Not(Equals), -1)
+	c.Check(strings.Index(api.Logs["crunch-run"].String(), "Running broken node hook \"/bin/echo\""), Not(Equals), -1)
 
 }
 
 func (s *TestSuite) TestFullBrokenDocker2(c *C) {
+	ech := ""
+	brokenNodeHook = &ech
+
 	api, _, _ := FullRunHelper(c, `{
     "command": ["echo", "hello world"],
     "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",
@@ -1807,9 +1810,6 @@ func (s *TestSuite) TestFullBrokenDocker2(c *C) {
 		t.logWriter.Close()
 	})
 
-	ech := ""
-	brokenNodeHook = &ech
-
 	c.Check(api.CalledWith("container.state", "Queued"), NotNil)
 	c.Check(strings.Index(api.Logs["crunch-run"].String(), "unable to run containers"), Not(Equals), -1)
 	c.Check(strings.Index(api.Logs["crunch-run"].String(), "No broken node hook"), Not(Equals), -1)

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


hooks/post-receive
--