diff options
| author | baude <bbaude@redhat.com> | 2018-03-14 15:17:05 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-03-14 20:38:08 +0000 |
| commit | ff091cf731cb28e5d38ff843781115d352ea1530 (patch) | |
| tree | 5b14726f448ba8b0a6c30bdaff159d7ec9b18142 /test/e2e/kill_test.go | |
| parent | b85b217f55993955da9ad0cae7735747b2f24390 (diff) | |
| download | podman-ff091cf731cb28e5d38ff843781115d352ea1530.tar.gz podman-ff091cf731cb28e5d38ff843781115d352ea1530.tar.bz2 podman-ff091cf731cb28e5d38ff843781115d352ea1530.zip | |
sleep does not catch SIGTERM
As Matt pointed out, when running sleep in a container, the clean up was taking a
full ten seconds to stop container because sleep does not catch SIGTERM which is
the default podman stop signal and it had to wait for SIGKILL. Changing sleep to
top should result in better test times.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #492
Approved by: rhatdan
Diffstat (limited to 'test/e2e/kill_test.go')
| -rw-r--r-- | test/e2e/kill_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index c0ee3dab9..4b5cf72b6 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -35,7 +35,7 @@ var _ = Describe("Podman kill", func() { }) It("podman kill a running container by id", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -48,7 +48,7 @@ var _ = Describe("Podman kill", func() { }) It("podman kill a running container by id with TERM", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -60,7 +60,7 @@ var _ = Describe("Podman kill", func() { }) It("podman kill a running container by name", func() { - session := podmanTest.RunSleepContainer("test1") + session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -71,7 +71,7 @@ var _ = Describe("Podman kill", func() { }) It("podman kill a running container by id with a bogus signal", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -83,7 +83,7 @@ var _ = Describe("Podman kill", func() { }) It("podman kill latest container", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |