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/libpod_suite_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/libpod_suite_test.go')
-rw-r--r-- | test/e2e/libpod_suite_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 87017ad27..10247f428 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -363,14 +363,14 @@ func (p *PodmanTest) RestoreAllArtifacts() error { return nil } -//RunSleepContainer runs a simple container in the background that -// sleeps. If the name passed != "", it will have a name -func (p *PodmanTest) RunSleepContainer(name string) *PodmanSession { +//RunTopContainer runs a simple container in the background that +// runs top. If the name passed != "", it will have a name +func (p *PodmanTest) RunTopContainer(name string) *PodmanSession { var podmanArgs = []string{"run"} if name != "" { podmanArgs = append(podmanArgs, "--name", name) } - podmanArgs = append(podmanArgs, "-d", ALPINE, "sleep", "90") + podmanArgs = append(podmanArgs, "-d", ALPINE, "top") return p.Podman(podmanArgs) } |