12614: Fix tests

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 6581c6bfb2b96245d83977a1473e7d81f9ec2b0d..bcf97041b2f268304c49df834e6d73181d5396e8 100644 (file)
--- 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)