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/stop_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/stop_test.go')
| -rw-r--r-- | test/e2e/stop_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 882834f0c..4811f5973 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -34,7 +34,7 @@ var _ = Describe("Podman stop", func() { }) It("podman stop container by id", func() { - session := podmanTest.RunSleepContainer("") + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -44,7 +44,7 @@ var _ = Describe("Podman stop", func() { }) It("podman stop container by name", func() { - session := podmanTest.RunSleepContainer("test1") + session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"stop", "test1"}) @@ -53,17 +53,17 @@ var _ = Describe("Podman stop", func() { }) It("podman stop all containers", func() { - session := podmanTest.RunSleepContainer("test1") + session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid1 := session.OutputToString() - session = podmanTest.RunSleepContainer("test2") + session = podmanTest.RunTopContainer("test2") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid2 := session.OutputToString() - session = podmanTest.RunSleepContainer("test3") + session = podmanTest.RunTopContainer("test3") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid3 := session.OutputToString() @@ -78,7 +78,7 @@ var _ = Describe("Podman stop", func() { }) It("podman stop latest containers", func() { - session := podmanTest.RunSleepContainer("test1") + session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"stop", "-l", "-t", "1"}) |