Merge branch '20183-update-priority-thread' refs #20183

[arvados.git] / lib / controller / integration_test.go

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index b0ec4293a38acfdf6a349db48fff96c7bf3f7a1a..e207e669c8ec8ac203b6211ff69a3f33d7e17dfa 100644 (file)
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -72,6 +72,8 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
       Insecure: true
     SystemLogs:
       Format: text
+    API:
+      MaxConcurrentRequests: 128
     Containers:
       CloudVMs:
         Enable: true
@@ -1133,7 +1135,7 @@ func (s *IntegrationSuite) TestRunTrivialContainer(c *check.C) {
                "environment":         map[string]string{},
                "mounts":              map[string]arvados.Mount{"/out": {Kind: "tmp", Capacity: 10000}},
                "output_path":         "/out",
-               "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1},
+               "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1, KeepCacheRAM: 1 << 26},
                "priority":            1,
                "state":               arvados.ContainerRequestStateCommitted,
        }, 0)
@@ -1160,7 +1162,7 @@ func (s *IntegrationSuite) TestContainerInputOnDifferentCluster(c *check.C) {
                        "/out": {Kind: "tmp", Capacity: 10000},
                },
                "output_path":         "/out",
-               "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1},
+               "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1, KeepCacheRAM: 1 << 26},
                "priority":            1,
                "state":               arvados.ContainerRequestStateCommitted,
                "container_count_max": 1,
@@ -1245,6 +1247,8 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, token stri
                        time.Sleep(time.Second / 2)
                }
        }
+       c.Logf("cr.CumulativeCost == %f", cr.CumulativeCost)
+       c.Check(cr.CumulativeCost, check.Not(check.Equals), 0.0)
        if expectExitCode >= 0 {
                c.Check(ctr.State, check.Equals, arvados.ContainerStateComplete)
                c.Check(ctr.ExitCode, check.Equals, expectExitCode)