summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-07 06:32:31 -0800
committerGitHub <noreply@github.com>2018-11-07 06:32:31 -0800
commit9150d69087aed8f52b169eaf556159cc8b1d26d3 (patch)
tree1d65ee8f6fe34fe0701de31df18a6803a85c057b
parent76360d9a6ef73f694138766b81f380e45a860556 (diff)
parentb89a7c7406dbd3682cd1d8e4b19911f6ef3a8959 (diff)
downloadpodman-9150d69087aed8f52b169eaf556159cc8b1d26d3.tar.gz
podman-9150d69087aed8f52b169eaf556159cc8b1d26d3.tar.bz2
podman-9150d69087aed8f52b169eaf556159cc8b1d26d3.zip
Merge pull request #1768 from baude/pausecontainertests
Fix cleanup for "Pause a bunch of running containers"
-rw-r--r--.papr.sh3
-rw-r--r--test/e2e/pause_test.go4
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() {