18290: LSF: make the bsub arguments completely configurable.

[arvados.git] / lib / lsf / dispatch_test.go

diff --git a/lib/lsf/dispatch_test.go b/lib/lsf/dispatch_test.go
index 96151fa8da9bc546c39a59479d06065da188cef0..641453e5480ced43609efcb499d5dbff61383cae 100644 (file)
--- a/lib/lsf/dispatch_test.go
+++ b/lib/lsf/dispatch_test.go
@@ -72,20 +72,27 @@ func (stub lsfstub) stubCommand(s *suite, c *check.C) func(prog string, args ...
                switch prog {
                case "bsub":
                        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")
+                       c.Assert(len(args), check.Equals, len(defaultArgs))
+                       // %%J must have been rewritten to %J
+                       c.Check(args[1], check.Equals, "/tmp/crunch-run.%J.out")
+                       args = args[4:]
                        switch args[1] {
                        case arvadostest.LockedContainerUUID:
-                               c.Check(args, check.DeepEquals, []string{"-J", arvadostest.LockedContainerUUID, "-R", "rusage[mem=11701MB:tmp=0MB] affinity[core(4)]"})
+                               c.Check(args, check.DeepEquals, []string{
+                                       "-J", arvadostest.LockedContainerUUID,
+                                       "-n", "4",
+                                       "-D", "11701MB",
+                                       "-R", "rusage[mem=11701MB:tmp=0MB] span[hosts=1]"})
                                mtx.Lock()
                                fakejobq[nextjobid] = args[1]
                                nextjobid++
                                mtx.Unlock()
                        case arvadostest.QueuedContainerUUID:
-                               c.Check(args, check.DeepEquals, []string{"-J", arvadostest.QueuedContainerUUID, "-R", "rusage[mem=11701MB:tmp=45777MB] affinity[core(4)]"})
+                               c.Check(args, check.DeepEquals, []string{
+                                       "-J", arvadostest.QueuedContainerUUID,
+                                       "-n", "4",
+                                       "-D", "11701MB",
+                                       "-R", "rusage[mem=11701MB:tmp=45777MB] span[hosts=1]"})
                                mtx.Lock()
                                fakejobq[nextjobid] = args[1]
                                nextjobid++