From 49b3647410474cfc2d5010c6c329e6673fc02fe4 Mon Sep 17 00:00:00 2001 From: baude Date: Sun, 29 Jul 2018 15:50:16 -0500 Subject: 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 Closes: #1181 Approved by: rhatdan --- test/e2e/libpod_suite_test.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test/e2e/libpod_suite_test.go') 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 -- cgit v1.2.3-54-g00ecf