diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-01 13:37:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-01 13:37:19 +0200 |
| commit | 6f62dac163dd935866c21e91e5cd623772907eda (patch) | |
| tree | c54863804158f85e206352da00133c0f12c60f7e /test/e2e | |
| parent | ee15e76da0a032bad7cb94295dc32e2553f10850 (diff) | |
| parent | 5370d9cb76a8075332f5ab6a0efef9fba28ba19b (diff) | |
| download | podman-6f62dac163dd935866c21e91e5cd623772907eda.tar.gz podman-6f62dac163dd935866c21e91e5cd623772907eda.tar.bz2 podman-6f62dac163dd935866c21e91e5cd623772907eda.zip | |
Merge pull request #3341 from rhatdan/exit
Add new exit codes to rm & rmi for running containers & dependencies
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/checkpoint_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/pause_test.go | 4 | ||||
| -rw-r--r-- | test/e2e/rm_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/rmi_test.go | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 8f3cf5c10..0261acbd9 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -147,7 +147,7 @@ var _ = Describe("Podman checkpoint", func() { result = podmanTest.Podman([]string{"rm", cid}) result.WaitWithDefaultTimeout() - Expect(result.ExitCode()).To(Equal(125)) + Expect(result.ExitCode()).To(Equal(2)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) result = podmanTest.Podman([]string{"rm", "-f", cid}) diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 01fb6d91b..455f60937 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -126,7 +126,7 @@ var _ = Describe("Podman pause", func() { result = podmanTest.Podman([]string{"rm", cid}) result.WaitWithDefaultTimeout() - Expect(result.ExitCode()).To(Equal(125)) + Expect(result.ExitCode()).To(Equal(2)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState)) @@ -179,7 +179,7 @@ var _ = Describe("Podman pause", func() { result = podmanTest.Podman([]string{"rm", cid}) result.WaitWithDefaultTimeout() - Expect(result.ExitCode()).To(Equal(125)) + Expect(result.ExitCode()).To(Equal(2)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) result = podmanTest.Podman([]string{"rm", "-f", cid}) diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 2dbabbf6a..8ee7dc750 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -49,7 +49,7 @@ var _ = Describe("Podman rm", func() { result := podmanTest.Podman([]string{"rm", cid}) result.WaitWithDefaultTimeout() - Expect(result.ExitCode()).To(Equal(125)) + Expect(result.ExitCode()).To(Equal(2)) }) It("podman rm created container", func() { diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 1b0329a83..d4e2407ec 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -145,7 +145,7 @@ var _ = Describe("Podman rmi", func() { session = podmanTest.PodmanNoCache([]string{"rmi", "-f", untaggedImg}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Not(Equal(0))) + Expect(session.ExitCode()).To(Equal(2)) }) It("podman rmi image that is created from another named imaged", func() { |