From b89a7c7406dbd3682cd1d8e4b19911f6ef3a8959 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 6 Nov 2018 19:35:22 -0600 Subject: Fix cleanup for "Pause a bunch of running containers" When running integration tests in our CI, we observe a problem where paused containers are not able to be stopped; and therefore cannot be cleaned up. This leaves dangling mounts and sometimes zombied conmon processes. Signed-off-by: baude --- .papr.sh | 3 --- test/e2e/pause_test.go | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.papr.sh b/.papr.sh index 120b3d94b..284326709 100644 --- a/.papr.sh +++ b/.papr.sh @@ -139,6 +139,3 @@ if [ $integrationtest -eq 1 ]; then fi make ginkgo GOPATH=/go $INTEGRATION_TEST_ENVS fi - - -exit 0 diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 24876b6d6..1a2eb1a09 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -250,6 +250,10 @@ var _ = Describe("Podman pause", func() { running.WaitWithDefaultTimeout() Expect(running.ExitCode()).To(Equal(0)) Expect(len(running.OutputToStringArray())).To(Equal(0)) + + unpause := podmanTest.Podman([]string{"unpause", "--all"}) + unpause.WaitWithDefaultTimeout() + Expect(unpause.ExitCode()).To(Equal(0)) }) It("Unpause a bunch of running containers", func() { -- cgit v1.2.3-54-g00ecf