[ARVADOS] updated: 2.1.0-1059-g753d479b0

Git user git at public.arvados.org
Wed Jul 14 20:48:20 UTC 2021


Summary of changes:
 services/crunch-dispatch-local/crunch-dispatch-local_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  753d479b0b5960674bf8e5a27ee98f68b3cd06ce (commit)
      from  3bd5ef5231bcc2d378c9cf756168390dbd06bb32 (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 753d479b0b5960674bf8e5a27ee98f68b3cd06ce
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jul 14 16:47:45 2021 -0400

    17816: Fix tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at 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 5f51134df..d976bf081 100644
--- 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()
 	}
 
+	cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
+
 	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()
 	}
 
@@ -184,8 +186,10 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
 		return cmd.Start()
 	}
 
+	cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
+
 	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()
 	}
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list