17816: Fix tests

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index 5f51134df8a9866a126fc32922787fd2be7c8957..d976bf0812950488b796cb063def8c960d128849 100644 (file)
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -81,8 +81,10 @@ func (s *TestSuite) TestIntegration(c *C) {
                return cmd.Start()
        }
 
                return cmd.Start()
        }
 

+       cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
+

        dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
        dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {

-               (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
+               (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)

                cancel()
        }
 
                cancel()
        }
 


@@ -184,8 +186,10 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
                return cmd.Start()
        }
 
                return cmd.Start()
        }
 

+       cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
+

        dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
        dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {

-               (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
+               (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)

                cancel()
        }
 
                cancel()
        }