summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-07 12:17:41 +0200
committerGitHub <noreply@github.com>2021-06-07 12:17:41 +0200
commiteaf53b6bb8d24b533ca4ca0f45ae69abd1086fdd (patch)
tree9c23888f7a38bcd4c4be7a5dbd1e1155b612b55a /test/e2e
parentaca6ef01d8bd265fb5343cf9b8a212f6073a2095 (diff)
parent9ac5267598c3665eb152bf73afba14495b9674f4 (diff)
downloadpodman-eaf53b6bb8d24b533ca4ca0f45ae69abd1086fdd.tar.gz
podman-eaf53b6bb8d24b533ca4ca0f45ae69abd1086fdd.tar.bz2
podman-eaf53b6bb8d24b533ca4ca0f45ae69abd1086fdd.zip
Merge pull request #10557 from vrothberg/fix-5572
systemd/generate: change type to notify
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/generate_systemd_test.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 75d778f10..e03d6899e 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -215,7 +215,6 @@ var _ = Describe("Podman generate systemd", func() {
// Grepping the output (in addition to unit tests)
Expect(session.OutputToString()).To(ContainSubstring("# container-foo.service"))
Expect(session.OutputToString()).To(ContainSubstring(" --replace "))
- Expect(session.OutputToString()).To(ContainSubstring(" stop --ignore --cidfile %t/container-foo.ctr-id -t 42"))
if !IsRemote() {
// The podman commands in the unit should contain the root flags if generate systemd --new is used
Expect(session.OutputToString()).To(ContainSubstring(" --runroot"))
@@ -234,7 +233,6 @@ var _ = Describe("Podman generate systemd", func() {
// Grepping the output (in addition to unit tests)
Expect(session.OutputToString()).To(ContainSubstring("# container-foo.service"))
Expect(session.OutputToString()).To(ContainSubstring(" --replace "))
- Expect(session.OutputToString()).To(ContainSubstring(" stop --ignore --cidfile %t/container-foo.ctr-id -t 42"))
})
It("podman generate systemd --new without explicit detaching param", func() {
@@ -247,7 +245,7 @@ var _ = Describe("Podman generate systemd", func() {
Expect(session.ExitCode()).To(Equal(0))
// Grepping the output (in addition to unit tests)
- Expect(session.OutputToString()).To(ContainSubstring("--cgroups=no-conmon -d"))
+ Expect(session.OutputToString()).To(ContainSubstring(" -d "))
})
It("podman generate systemd --new with explicit detaching param in middle", func() {