diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-22 17:51:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 17:51:14 +0100 |
| commit | 40ae7e74b7cba36ebf1a5e89da4e749ed936189b (patch) | |
| tree | 675abce8732b1750d52aed10f2322a751a15fda9 /test/e2e/run_cgroup_parent_test.go | |
| parent | bfc929efc44cc9255406ed6c2abec1b8a4f36dab (diff) | |
| parent | c03b6b54fd48e18c365ea0351b4e9df05587aa1d (diff) | |
| download | podman-40ae7e74b7cba36ebf1a5e89da4e749ed936189b.tar.gz podman-40ae7e74b7cba36ebf1a5e89da4e749ed936189b.tar.bz2 podman-40ae7e74b7cba36ebf1a5e89da4e749ed936189b.zip | |
Merge pull request #12349 from edsantiago/clean_fixmes
Semiperiodic cleanup of obsolete Skip()s
Diffstat (limited to 'test/e2e/run_cgroup_parent_test.go')
| -rw-r--r-- | test/e2e/run_cgroup_parent_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index e0e1d4b1d..6bdc6af08 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -48,21 +48,22 @@ var _ = Describe("Podman run with --cgroup-parent", func() { run := podmanTest.Podman([]string{"run", "--cgroupns=host", "--cgroup-parent", cgroup, fedoraMinimal, "cat", "/proc/self/cgroup"}) run.WaitWithDefaultTimeout() Expect(run).Should(Exit(0)) - ok, _ := run.GrepString(cgroup) - Expect(ok).To(BeTrue()) + Expect(run.OutputToString()).To(ContainSubstring(cgroup)) }) Specify("no --cgroup-parent", func() { - SkipIfRootless("FIXME This seems to be broken in rootless mode") cgroup := "/libpod_parent" if !Containerized() && podmanTest.CgroupManager != "cgroupfs" { - cgroup = "/machine.slice" + if isRootless() { + cgroup = "/user.slice" + } else { + cgroup = "/machine.slice" + } } run := podmanTest.Podman([]string{"run", "--cgroupns=host", fedoraMinimal, "cat", "/proc/self/cgroup"}) run.WaitWithDefaultTimeout() Expect(run).Should(Exit(0)) - ok, _ := run.GrepString(cgroup) - Expect(ok).To(BeTrue()) + Expect(run.OutputToString()).To(ContainSubstring(cgroup)) }) Specify("always honor --cgroup-parent", func() { @@ -114,7 +115,6 @@ var _ = Describe("Podman run with --cgroup-parent", func() { run := podmanTest.Podman([]string{"run", "--cgroupns=host", "--cgroup-parent", cgroup, fedoraMinimal, "cat", "/proc/1/cgroup"}) run.WaitWithDefaultTimeout() Expect(run).Should(Exit(0)) - ok, _ := run.GrepString(cgroup) - Expect(ok).To(BeTrue()) + Expect(run.OutputToString()).To(ContainSubstring(cgroup)) }) }) |