[ARVADOS] updated: 2.1.0-1274-g2c2153daa

[Git user]

Summary of changes:
 lib/lsf/dispatch_test.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

       via  2c2153daa103c35fe12468a853636f8125785a7e (commit)
      from  8f266e877db7d819c9fa74d680a320c6153bd207 (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 2c2153daa103c35fe12468a853636f8125785a7e
Author: Tom Clegg <tom at curii.com>
Date:   Wed Sep 1 09:18:29 2021 -0400

    Update test to accept non-empty default BsubArgumentsList.
    
    refs #17857
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/lsf/dispatch_test.go b/lib/lsf/dispatch_test.go
index 7cf6df643..96151fa8d 100644
--- a/lib/lsf/dispatch_test.go
+++ b/lib/lsf/dispatch_test.go
@@ -53,7 +53,7 @@ type lsfstub struct {
 	errorRate float64
 }
 
-func (stub lsfstub) stubCommand(c *check.C) func(prog string, args ...string) *exec.Cmd {
+func (stub lsfstub) stubCommand(s *suite, c *check.C) func(prog string, args ...string) *exec.Cmd {
 	mtx := sync.Mutex{}
 	nextjobid := 100
 	fakejobq := map[int]string{}
@@ -71,7 +71,11 @@ func (stub lsfstub) stubCommand(c *check.C) func(prog string, args ...string) *e
 		}
 		switch prog {
 		case "bsub":
-			c.Assert(args, check.HasLen, 4)
+			defaultArgs := s.disp.Cluster.Containers.LSF.BsubArgumentsList
+			c.Assert(args, check.HasLen, 4+len(defaultArgs))
+			c.Check(args[:len(defaultArgs)], check.DeepEquals, defaultArgs)
+			args = args[len(defaultArgs):]
+
 			c.Check(args[0], check.Equals, "-J")
 			switch args[1] {
 			case arvadostest.LockedContainerUUID:
@@ -124,7 +128,7 @@ func (s *suite) TestSubmit(c *check.C) {
 	s.disp.lsfcli.stubCommand = lsfstub{
 		errorRate: 0.1,
 		sudoUser:  s.disp.Cluster.Containers.LSF.BsubSudoUser,
-	}.stubCommand(c)
+	}.stubCommand(s, c)
 	s.disp.Start()
 	deadline := time.Now().Add(20 * time.Second)
 	for range time.NewTicker(time.Second).C {

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


hooks/post-receive
--