containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
baude 2018-07-29 15:50:16 -05:00 committed by Atomic Bot
parent 433cbd5254
commit 49b3647410
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/libpod_suite_test.go
View File

@ -216,6 +216,9 @@ func WaitForContainer(p *PodmanTest) bool {
// Cleanup cleans up the temporary store // Cleanup cleans up the temporary store
func (p *PodmanTest) Cleanup() { func (p *PodmanTest) Cleanup() {
// Remove all containers // Remove all containers
stopall := p.Podman([]string{"stop", "-a", "--timeout", "0"})
stopall.WaitWithDefaultTimeout()
session := p.Podman([]string{"rm", "-fa"}) session := p.Podman([]string{"rm", "-fa"})
session.Wait(90) session.Wait(90)
// Nuke tempdir // Nuke tempdir

4
test/e2e/wait_test.go
View File

@ -48,7 +48,7 @@ var _ = Describe("Podman wait", func() {
}) })
It("podman wait on a sleeping container", 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) session.Wait(20)
cid := session.OutputToString() cid := session.OutputToString()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -57,7 +57,7 @@ var _ = Describe("Podman wait", func() {
}) })
It("podman wait on latest container", 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) session.Wait(20)
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
session = podmanTest.Podman([]string{"wait", "-l"}) session = podmanTest.Podman([]string{"wait", "-l"})