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/stats_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/stats_test.go')
| -rw-r--r-- | test/e2e/stats_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index f1d374f60..bfcee1ba0 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -39,8 +39,8 @@ var _ = Describe("Podman stats", func() { Expect(session.ExitCode()).To(Equal(125)) }) - It("podman on a running container", func() { - session := podmanTest.Podman([]string{"run", "-d", "-t", ALPINE, "sleep", "99"}) + It("podman stats on a running container", func() { + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() @@ -49,8 +49,8 @@ var _ = Describe("Podman stats", func() { Expect(session.ExitCode()).To(Equal(0)) }) - It("podman on a running container no id", func() { - session := podmanTest.Podman([]string{"run", "-d", "-t", ALPINE, "sleep", "99"}) + It("podman stats on a running container no id", func() { + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"stats", "--no-stream"}) @@ -59,7 +59,7 @@ var _ = Describe("Podman stats", func() { }) It("podman stats on all containers", func() { - session := podmanTest.Podman([]string{"run", "-d", "-t", ALPINE, "sleep", "99"}) + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"stats", "--no-stream", "-a"}) @@ -68,7 +68,7 @@ var _ = Describe("Podman stats", func() { }) It("podman stats only output cids", func() { - session := podmanTest.Podman([]string{"run", "-d", "-t", ALPINE, "sleep", "99"}) + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"stats", "--no-stream", "--format", "\"{{.Container}}\""}) @@ -77,7 +77,7 @@ var _ = Describe("Podman stats", func() { }) It("podman stats with json output", func() { - session := podmanTest.Podman([]string{"run", "-d", "-t", ALPINE, "sleep", "99"}) + session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"stats", "--no-stream", "--format", "json"}) |