X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/83974ae9df4060f7aaa6bba61997404a2a7405b2..2c8bbcd431eb3aee1b4fd650b8268979b8da556c:/lib/lsf/dispatch_test.go?ds=sidebyside

diff --git a/lib/lsf/dispatch_test.go b/lib/lsf/dispatch_test.go
index e51e719066..cd41071d2c 100644
--- 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]