From 3c044f9267f62b8f7f88c7395ad325df3bf420f5 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 30 Jan 2018 13:19:01 -0600 Subject: Ginkgo Tests: ps, pull, push and rm Migrate ps, pull, push, and rm from bats to ginkgo. Also, fixed a conditional issue with adding ports when an image defines the port and the user wants to override it. Signed-off-by: baude Closes: #277 Approved by: baude --- test/e2e/rmi_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/e2e/rmi_test.go') diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 895c812c6..04346f5ac 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -32,21 +32,21 @@ var _ = Describe("Podman rmi", func() { It("podman rmi bogus image", func() { session := podmanTest.Podman([]string{"rmi", "debian:6.0.10"}) - session.Wait() + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) }) It("podman rmi with fq name", func() { session := podmanTest.Podman([]string{"rmi", image1}) - session.Wait() + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) It("podman rmi with short name", func() { session := podmanTest.Podman([]string{"rmi", "alpine"}) - session.Wait() + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) @@ -54,7 +54,7 @@ var _ = Describe("Podman rmi", func() { It("podman rmi all images", func() { podmanTest.PullImages([]string{image3}) session := podmanTest.Podman([]string{"rmi", "-a"}) - session.Wait() + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) @@ -62,7 +62,7 @@ var _ = Describe("Podman rmi", func() { It("podman rmi all images forceably with short options", func() { podmanTest.PullImages([]string{image3}) session := podmanTest.Podman([]string{"rmi", "-fa"}) - session.Wait() + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) -- cgit v1.2.3-54-g00ecf