diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-11-22 11:05:59 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-11-23 09:38:51 +0100 |
| commit | 566b78dd02e91f376e9f219cb96ddba153671eb5 (patch) | |
| tree | 02e30c7c2fc1e2726579ee1f5d8fc9e38fea40f2 /test | |
| parent | 1bfbb28b0365790552483b961b4bd48a69dd8070 (diff) | |
| download | podman-566b78dd02e91f376e9f219cb96ddba153671eb5.tar.gz podman-566b78dd02e91f376e9f219cb96ddba153671eb5.tar.bz2 podman-566b78dd02e91f376e9f219cb96ddba153671eb5.zip | |
generate systemd: add --start-timeout flag
Add a new flag to set the start timeout for a generated systemd unit.
To make naming consistent, add a new --stop-timeout flag as well and let
the previous --time map to it.
Fixes: #11618
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/generate_systemd_test.go | 9 | ||||
| -rw-r--r-- | test/system/250-systemd.bats | 2 |
2 files changed, 10 insertions, 1 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")) }) diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats index e997ab6f9..4757f7643 100644 --- a/test/system/250-systemd.bats +++ b/test/system/250-systemd.bats @@ -138,7 +138,7 @@ function service_cleanup() { } # Regression test for #11438 -@test "podman generate systemd - restart policy" { +@test "podman generate systemd - restart policy & timeouts" { cname=$(random_string) run_podman create --restart=always --name $cname $IMAGE run_podman generate systemd --new $cname |