diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-18 14:41:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 14:41:15 -0400 |
| commit | 4ec227079011faef53e22b868d475a831b1f9e89 (patch) | |
| tree | c284fb692d70cb9e490b150814ad0e1a91bd595a /test/e2e/systemd_test.go | |
| parent | a3d8b48fd56a722642f7cbcad52b2fa88f12b656 (diff) | |
| parent | 9dd088e555870c6bf149f9d83a5095880580a56a (diff) | |
| download | podman-4ec227079011faef53e22b868d475a831b1f9e89.tar.gz podman-4ec227079011faef53e22b868d475a831b1f9e89.tar.bz2 podman-4ec227079011faef53e22b868d475a831b1f9e89.zip | |
Merge pull request #10829 from cevich/update_images
Update images
Diffstat (limited to 'test/e2e/systemd_test.go')
| -rw-r--r-- | test/e2e/systemd_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index bb51d6ac2..3213a839a 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -6,7 +6,6 @@ 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" @@ -118,11 +117,13 @@ WantedBy=multi-user.target 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).Should(Exit(0)) + // stats not supported w/ CGv1 rootless or containerized + if isCgroupsV1() && (isRootless() || isContainerized()) { + return } + stats := podmanTest.Podman([]string{"stats", "--no-stream", ctrName}) + stats.WaitWithDefaultTimeout() + Expect(stats).Should(Exit(0)) }) It("podman create container with systemd entrypoint triggers systemd mode", func() { |