diff options
Diffstat (limited to 'test/e2e/wait_test.go')
| -rw-r--r-- | test/e2e/wait_test.go | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 71df28ca8..96bc8dbde 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -6,6 +6,7 @@ import ( . "github.com/containers/podman/v3/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman wait", func() { @@ -35,7 +36,7 @@ var _ = Describe("Podman wait", func() { It("podman wait on bogus container", func() { session := podmanTest.Podman([]string{"wait", "1234"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(125)) + Expect(session).Should(Exit(125)) }) @@ -43,91 +44,91 @@ var _ = Describe("Podman wait", func() { session := podmanTest.Podman([]string{"run", "-d", ALPINE, "ls"}) session.Wait(10) cid := session.OutputToString() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"wait", cid}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman wait on a sleeping container", func() { session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) cid := session.OutputToString() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"wait", cid}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman wait on latest container", func() { session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) if IsRemote() { session = podmanTest.Podman([]string{"wait", session.OutputToString()}) } else { session = podmanTest.Podman([]string{"wait", "-l"}) } session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman container wait on latest container", func() { session := podmanTest.Podman([]string{"container", "run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) if IsRemote() { session = podmanTest.Podman([]string{"container", "wait", session.OutputToString()}) } else { session = podmanTest.Podman([]string{"container", "wait", "-l"}) } session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman container wait on latest container with --interval flag", func() { session := podmanTest.Podman([]string{"container", "run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"container", "wait", "-i", "5000", session.OutputToString()}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman container wait on latest container with --interval flag", func() { session := podmanTest.Podman([]string{"container", "run", "-d", ALPINE, "sleep", "1"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"container", "wait", "--interval", "1s", session.OutputToString()}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman container wait on container with bogus --interval", func() { session := podmanTest.Podman([]string{"container", "run", "-d", ALPINE, "sleep", "1"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"container", "wait", "--interval", "100days", session.OutputToString()}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(125)) + Expect(session).Should(Exit(125)) }) It("podman wait on three containers", func() { session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) cid1 := session.OutputToString() session = podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) cid2 := session.OutputToString() session = podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) cid3 := session.OutputToString() session = podmanTest.Podman([]string{"wait", cid1, cid2, cid3}) session.Wait(20) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(session.OutputToStringArray()).To(Equal([]string{"0", "0", "0"})) }) }) |