summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-11-23 11:25:41 +0100
committerGitHub <noreply@github.com>2021-11-23 11:25:41 +0100
commit90c635fd675bf9378e0ee0cbc7b95229bf9653e4 (patch)
tree284aa5a3bf10350bf47bacc41f124fcad55c33e8 /test/e2e
parenta55473bea80c2d9e5d79ac97a2bfe313622033f9 (diff)
parent566b78dd02e91f376e9f219cb96ddba153671eb5 (diff)
downloadpodman-90c635fd675bf9378e0ee0cbc7b95229bf9653e4.tar.gz
podman-90c635fd675bf9378e0ee0cbc7b95229bf9653e4.tar.bz2
podman-90c635fd675bf9378e0ee0cbc7b95229bf9653e4.zip
Merge pull request #12380 from vrothberg/fix-11618
generate systemd: add --start-timeout flag
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/generate_systemd_test.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 121f09a11..e93482535 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -147,6 +147,15 @@ var _ = Describe("Podman generate systemd", func() {
session := podmanTest.Podman([]string{"generate", "systemd", "--time", "5", "nginx"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
+ Expect(session.OutputToString()).To(ContainSubstring("TimeoutStopSec=65"))
+ Expect(session.OutputToString()).ToNot(ContainSubstring("TimeoutStartSec="))
+ Expect(session.OutputToString()).To(ContainSubstring("podman stop -t 5"))
+
+ session = podmanTest.Podman([]string{"generate", "systemd", "--stop-timeout", "5", "--start-timeout", "123", "nginx"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+ Expect(session.OutputToString()).To(ContainSubstring("TimeoutStartSec=123"))
+ Expect(session.OutputToString()).To(ContainSubstring("TimeoutStopSec=65"))
Expect(session.OutputToString()).To(ContainSubstring("podman stop -t 5"))
})