diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-25 21:32:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 21:32:20 +0100 |
| commit | 6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b (patch) | |
| tree | 485ed1b7ce86431008b4ff47709982a23dff6639 /test/e2e/run_memory_test.go | |
| parent | 6a03a9a538804b406c34e75a2333045b9f7db7d5 (diff) | |
| parent | 80da73f13c69fa84055a317cb59f3a5eb1ffa09c (diff) | |
| download | podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.tar.gz podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.tar.bz2 podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.zip | |
Merge pull request #3901 from cevich/support_f31
Cirrus: Support testing with F31
Diffstat (limited to 'test/e2e/run_memory_test.go')
| -rw-r--r-- | test/e2e/run_memory_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index a45735a8a..d60f2a8cd 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -70,7 +70,11 @@ var _ = Describe("Podman run memory", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(Equal("41943040")) + if cgroupsv2 { + Expect(session.OutputToString()).To(Equal("max")) + } else { + Expect(session.OutputToString()).To(Equal("41943040")) + } }) It("podman run memory-swappiness test", func() { |