diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-14 13:05:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-14 13:05:29 +0200 |
| commit | 940126836022157e615d80cc42eb2b490ae8068d (patch) | |
| tree | c633cca6adfdaa8ed4b825e2772a5e9e90316986 /test | |
| parent | c64388728f5efec2658cf9097dbe15126f30753e (diff) | |
| parent | 0aedddd3b3ec0f14818aa0f04c24df1f0b2e3f3b (diff) | |
| download | podman-940126836022157e615d80cc42eb2b490ae8068d.tar.gz podman-940126836022157e615d80cc42eb2b490ae8068d.tar.bz2 podman-940126836022157e615d80cc42eb2b490ae8068d.zip | |
Merge pull request #15771 from dcermak/pod-systemd-exit-policy
[systemd] Ensure that podCreateArgs appear last in ExecStartPre=
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/generate_systemd_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index f47abbc13..550464829 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -562,7 +562,7 @@ var _ = Describe("Podman generate systemd", func() { Expect(session.OutputToString()).To(ContainSubstring("# pod-foo.service")) Expect(session.OutputToString()).To(ContainSubstring("Requires=container-foo-1.service container-foo-2.service")) 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 --name foo")) + 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")) |