diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-09 19:59:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 19:59:58 +0200 |
| commit | d9cd0032f7478e625329326d7593162a9f1e8c1e (patch) | |
| tree | 7479f96d73dae9dc186bffbb3cb203a3f1ae7558 /test/e2e/run_memory_test.go | |
| parent | 059bd37511e917f860e784307ee1f2766d8d4ec3 (diff) | |
| parent | b020d1ad13267bd71065457f83116af39c77f7e5 (diff) | |
| download | podman-d9cd0032f7478e625329326d7593162a9f1e8c1e.tar.gz podman-d9cd0032f7478e625329326d7593162a9f1e8c1e.tar.bz2 podman-d9cd0032f7478e625329326d7593162a9f1e8c1e.zip | |
Merge pull request #6906 from rhatdan/VENDOR
Vendor in new version of Buildah
Diffstat (limited to 'test/e2e/run_memory_test.go')
| -rw-r--r-- | test/e2e/run_memory_test.go | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index 0e88c09b3..5ae45b62f 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -78,13 +78,7 @@ var _ = Describe("Podman run memory", func() { }) It("podman run memory-swappiness test", func() { - cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() - Expect(err).To(BeNil()) - - if cgroupsv2 { - Skip("Memory swappiness not supported on cgroups v2") - } - + SkipIfCgroupV2() session := podmanTest.Podman([]string{"run", "--memory-swappiness=15", ALPINE, "cat", "/sys/fs/cgroup/memory/memory.swappiness"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -92,12 +86,7 @@ var _ = Describe("Podman run memory", func() { }) It("podman run kernel-memory test", func() { - cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() - Expect(err).To(BeNil()) - - if cgroupsv2 { - Skip("Kernel memory not supported on cgroups v2") - } + SkipIfCgroupV2() session := podmanTest.Podman([]string{"run", "--kernel-memory=40m", ALPINE, "cat", "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |