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/pause_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/pause_test.go')
| -rw-r--r-- | test/e2e/pause_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 7fa1274f0..a77568933 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -58,7 +58,7 @@ var _ = Describe("Podman pause", func() { }) It("podman pause a running container by id", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -75,7 +75,7 @@ var _ = Describe("Podman pause", func() { }) It("podman unpause a running container by id", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -89,7 +89,7 @@ var _ = Describe("Podman pause", func() { }) It("podman remove a paused container by id", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -130,7 +130,7 @@ var _ = Describe("Podman pause", func() { }) It("podman stop a paused container by id", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -167,7 +167,7 @@ var _ = Describe("Podman pause", func() { }) It("podman pause a running container by name", func() { - session := podmanTest.RunSleepContainer("test1") + session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -183,11 +183,11 @@ var _ = Describe("Podman pause", func() { }) It("podman pause a running container by id and another by name", func() { - session1 := podmanTest.RunSleepContainer("test1") + session1 := podmanTest.RunTopContainer("test1") session1.WaitWithDefaultTimeout() Expect(session1.ExitCode()).To(Equal(0)) - session2 := podmanTest.RunSleepContainer("") + session2 := podmanTest.RunTopContainer("") session2.WaitWithDefaultTimeout() Expect(session2.ExitCode()).To(Equal(0)) cid2 := session2.OutputToString() |