From: Tom Clegg <tom@curii.com>
Date: Thu, 29 Jul 2021 13:57:48 +0000 (-0400)
Subject: Merge branch '17756-dispatch-lsf' into main
X-Git-Tag: 2.3.0~126
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5d56a1af42f64df57ef7a1bcef6d016ff2310900

Merge branch '17756-dispatch-lsf' into main

closes #17756

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

5d56a1af42f64df57ef7a1bcef6d016ff2310900
diff --cc services/crunch-dispatch-local/crunch-dispatch-local_test.go
index d976bf0812,6ec31b1737..92b8d2adcd
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@@ -81,11 -81,9 +81,11 @@@ func (s *TestSuite) TestIntegration(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, &cl}).run(d, c, s)
- 		cancel()
+ 	dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+ 		defer cancel()
 -		return (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
++		return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
  	}
  
  	err = dispatcher.Run(ctx)
@@@ -186,11 -184,9 +186,11 @@@ func testWithServerStub(c *C, apiStubRe
  		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, &cl}).run(d, c, s)
- 		cancel()
+ 	dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+ 		defer cancel()
 -		return (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
++		return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
  	}
  
  	re := regexp.MustCompile(`(?ms).*` + expected + `.*`)