diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-06-09 13:55:03 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-06-10 14:49:58 +0200 |
| commit | 3b6cb8fabb2695df6518ee598abb945044afc758 (patch) | |
| tree | 951f1d0b84fb16f98bde12aa50c7e4bc53e14915 /test/e2e | |
| parent | d116bebdd564745f6d0adcd996e3a251b6d8e0e5 (diff) | |
| download | podman-3b6cb8fabb2695df6518ee598abb945044afc758.tar.gz podman-3b6cb8fabb2695df6518ee598abb945044afc758.tar.bz2 podman-3b6cb8fabb2695df6518ee598abb945044afc758.zip | |
container: ignore named hierarchies
when looking up the container cgroup, ignore named hierarchies since
containers running systemd as payload will create a sub-cgroup and
move themselves there.
Closes: https://github.com/containers/podman/issues/10602
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/systemd_test.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index b132750b0..8dc14d5f7 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -6,6 +6,7 @@ import ( "strings" "time" + "github.com/containers/podman/v3/pkg/rootless" . "github.com/containers/podman/v3/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -115,6 +116,12 @@ WantedBy=multi-user.target conData := result.InspectContainerToJSON() Expect(len(conData)).To(Equal(1)) Expect(conData[0].Config.SystemdMode).To(BeTrue()) + + if CGROUPSV2 || !rootless.IsRootless() { + stats := podmanTest.Podman([]string{"stats", "--no-stream", ctrName}) + stats.WaitWithDefaultTimeout() + Expect(stats.ExitCode()).To(Equal(0)) + } }) It("podman create container with systemd entrypoint triggers systemd mode", func() { |