diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-09 10:28:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-09 10:28:14 -0800 |
| commit | 78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b (patch) | |
| tree | 4adf8d4048a6b2c4c89ade6bb9375716d8fe8bd3 /test/e2e/pause_test.go | |
| parent | 7813f90ce623c8882e53171c8ffe7fb46664ead7 (diff) | |
| parent | 2dd9cae37cb076418393ba61c0fb7b8cf97148f3 (diff) | |
| download | podman-78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b.tar.gz podman-78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b.tar.bz2 podman-78e6d8e7d70d431ccf096dee0f8eadb1c9b2967b.zip | |
Merge pull request #1772 from baude/rmdelpaused
rm -f now removes a paused container
Diffstat (limited to 'test/e2e/pause_test.go')
| -rw-r--r-- | test/e2e/pause_test.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 1a2eb1a09..e80915670 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -91,7 +91,7 @@ var _ = Describe("Podman pause", func() { }) - It("podman remove a paused container by id", func() { + It("podman remove a paused container by id without force", func() { session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -111,25 +111,26 @@ var _ = Describe("Podman pause", func() { Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState)) - result = podmanTest.Podman([]string{"rm", "--force", cid}) - result.WaitWithDefaultTimeout() + }) - Expect(result.ExitCode()).To(Equal(125)) - Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) - Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState)) + It("podman remove a paused container by id with force", func() { + session := podmanTest.RunTopContainer("") + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + cid := session.OutputToString() - result = podmanTest.Podman([]string{"unpause", cid}) + result := podmanTest.Podman([]string{"pause", cid}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) - Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) + Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) + Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState)) result = podmanTest.Podman([]string{"rm", "--force", cid}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) - }) It("podman stop a paused container by id", func() { |