19847: Update test for new API default disk cache behavior.

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

diff --git a/lib/lsf/dispatch_test.go b/lib/lsf/dispatch_test.go
index e51e719066cbdf2b3f71d245eea9a7fc326fcbc3..cd41071d2cebc8bb62c96764ba767fa7da5e5835 100644 (file)
--- a/lib/lsf/dispatch_test.go
+++ b/lib/lsf/dispatch_test.go
@@ -45,6 +45,7 @@ func (s *suite) SetUpTest(c *check.C) {
        c.Assert(err, check.IsNil)
        cluster, err := cfg.GetCluster("")
        c.Assert(err, check.IsNil)
+       cluster.Containers.ReserveExtraRAM = 256 << 20
        cluster.Containers.CloudVMs.PollInterval = arvados.Duration(time.Second / 4)
        cluster.Containers.MinRetryPeriod = arvados.Duration(time.Second / 4)
        cluster.InstanceTypes = arvados.InstanceTypeMap{
@@ -78,8 +79,9 @@ func (s *suite) SetUpTest(c *check.C) {
        err = arvados.NewClientFromEnv().RequestAndDecode(&s.crPending, "POST", "arvados/v1/container_requests", nil, map[string]interface{}{
                "container_request": map[string]interface{}{
                        "runtime_constraints": arvados.RuntimeConstraints{
-                               RAM:   100000000,
-                               VCPUs: 2,
+                               RAM:           100000000,
+                               VCPUs:         2,
+                               KeepCacheDisk: 8 << 30,
                        },
                        "container_image":     arvadostest.DockerImage112PDH,
                        "command":             []string{"sleep", "1"},
@@ -179,10 +181,10 @@ func (stub lsfstub) stubCommand(s *suite, c *check.C) func(prog string, args ...
                                c.Check(args, check.DeepEquals, []string{
                                        "-J", s.crPending.ContainerUUID,
                                        "-n", "2",
-                                       "-D", "608MB",
-                                       "-R", "rusage[mem=608MB:tmp=256MB] span[hosts=1]",
-                                       "-R", "select[mem>=608MB]",
-                                       "-R", "select[tmp>=256MB]",
+                                       "-D", "352MB",
+                                       "-R", "rusage[mem=352MB:tmp=8448MB] span[hosts=1]",
+                                       "-R", "select[mem>=352MB]",
+                                       "-R", "select[tmp>=8448MB]",
                                        "-R", "select[ncpus>=2]"})
                                mtx.Lock()
                                fakejobq[nextjobid] = args[1]