From e7493a9e23325c00ad9a0db341d5887afe3ae5eb Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Thu, 17 Dec 2020 10:43:55 -0800 Subject: Set max memory not min Closes #5048 PiperOrigin-RevId: 348050472 --- test/e2e/integration_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'test/e2e') diff --git a/test/e2e/integration_test.go b/test/e2e/integration_test.go index 03bdfa889..d07ed6ba5 100644 --- a/test/e2e/integration_test.go +++ b/test/e2e/integration_test.go @@ -260,12 +260,10 @@ func TestMemLimit(t *testing.T) { d := dockerutil.MakeContainer(ctx, t) defer d.CleanUp(ctx) - // N.B. Because the size of the memory file may grow in large chunks, - // there is a minimum threshold of 1GB for the MemTotal figure. - allocMemory := 1024 * 1024 // In kb. + allocMemoryKb := 50 * 1024 out, err := d.Run(ctx, dockerutil.RunOpts{ Image: "basic/alpine", - Memory: allocMemory * 1024, // In bytes. + Memory: allocMemoryKb * 1024, // In bytes. }, "sh", "-c", "cat /proc/meminfo | grep MemTotal: | awk '{print $2}'") if err != nil { t.Fatalf("docker run failed: %v", err) @@ -285,7 +283,7 @@ func TestMemLimit(t *testing.T) { if err != nil { t.Fatalf("failed to parse %q: %v", out, err) } - if want := uint64(allocMemory); got != want { + if want := uint64(allocMemoryKb); got != want { t.Errorf("MemTotal got: %d, want: %d", got, want) } } -- cgit v1.2.3