diff options
| author | baude <bbaude@redhat.com> | 2018-07-29 15:50:16 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-30 12:26:39 +0000 |
| commit | 49b3647410474cfc2d5010c6c329e6673fc02fe4 (patch) | |
| tree | 38fb4fdbfee028d0d19759266ceb3ae318b1651a | |
| parent | 433cbd52543dccdad9806b8d44fd5d054ed559f1 (diff) | |
| download | podman-49b3647410474cfc2d5010c6c329e6673fc02fe4.tar.gz podman-49b3647410474cfc2d5010c6c329e6673fc02fe4.tar.bz2 podman-49b3647410474cfc2d5010c6c329e6673fc02fe4.zip | |
Speed up test results
Stop all containers with a zero timeout prior to trying to rm -fa. This results
in quicker teardown times by not waiting for timeouts.
Also, with wait tests, no need to wait the full 10 second sleep. 1 will do.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #1181
Approved by: rhatdan
| -rw-r--r-- | test/e2e/libpod_suite_test.go | 3 | ||||
| -rw-r--r-- | test/e2e/wait_test.go | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 6ec995bfc..ccd0334ff 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -216,6 +216,9 @@ func WaitForContainer(p *PodmanTest) bool { // Cleanup cleans up the temporary store func (p *PodmanTest) Cleanup() { // Remove all containers + stopall := p.Podman([]string{"stop", "-a", "--timeout", "0"}) + stopall.WaitWithDefaultTimeout() + session := p.Podman([]string{"rm", "-fa"}) session.Wait(90) // Nuke tempdir diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 08eb30658..8e7035204 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -48,7 +48,7 @@ var _ = Describe("Podman wait", func() { }) It("podman wait on a sleeping container", func() { - session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "10"}) + session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) cid := session.OutputToString() Expect(session.ExitCode()).To(Equal(0)) @@ -57,7 +57,7 @@ var _ = Describe("Podman wait", func() { }) It("podman wait on latest container", func() { - session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "10"}) + session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"wait", "-l"}) |