diff options
| author | Valentin Rothberg <vrothberg@redhat.com> | 2022-09-15 17:56:39 +0200 |
|---|---|---|
| committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-09-15 17:56:45 +0200 |
| commit | 884fd4575c12a4cc32af06f5a239cb47609a15df (patch) | |
| tree | 7f73d03bf3c3a7fe41784f8e9c0a3de3b91933d0 /test/e2e | |
| parent | 50c538b3cc7a218fe009180bbe20b0c464add6f7 (diff) | |
| download | podman-884fd4575c12a4cc32af06f5a239cb47609a15df.tar.gz podman-884fd4575c12a4cc32af06f5a239cb47609a15df.tar.bz2 podman-884fd4575c12a4cc32af06f5a239cb47609a15df.zip | |
Revert "generate systemd: drop ExecStop"
This reverts commit c20abf12c714f359c7bbb291c444530f70cb1185. In the
absence of `ExecStop` step, systemd will send the stop/kill signals to
the main PID while I asummed that systemd would jump directly to an
ExecStopPost step instead.
Hence revert the commit to let Podman take care of stopping rather than
systemd.
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/generate_systemd_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index 7ceea1b91..347440faf 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -566,6 +566,7 @@ var _ = Describe("Podman generate systemd", func() { Expect(session.OutputToString()).To(ContainSubstring("BindsTo=pod-foo.service")) Expect(session.OutputToString()).To(ContainSubstring("pod create --infra-conmon-pidfile %t/pod-foo.pid --pod-id-file %t/pod-foo.pod-id --exit-policy=stop --name foo")) Expect(session.OutputToString()).To(ContainSubstring("ExecStartPre=/bin/rm -f %t/pod-foo.pid %t/pod-foo.pod-id")) + Expect(session.OutputToString()).To(ContainSubstring("pod stop --ignore --pod-id-file %t/pod-foo.pod-id -t 10")) Expect(session.OutputToString()).To(ContainSubstring("pod rm --ignore -f --pod-id-file %t/pod-foo.pod-id")) }) |