diff options
Diffstat (limited to 'test/e2e/diff_test.go')
| -rw-r--r-- | test/e2e/diff_test.go | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index cf955772b..65ec0d1de 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -9,6 +9,7 @@ import ( "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman diff", func() { @@ -38,27 +39,27 @@ var _ = Describe("Podman diff", func() { It("podman diff of image", func() { session := podmanTest.Podman([]string{"diff", ALPINE}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 0)) }) It("podman diff bogus image", func() { session := podmanTest.Podman([]string{"diff", "1234"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(125)) + Expect(session).Should(Exit(125)) }) It("podman diff image with json output", func() { session := podmanTest.Podman([]string{"diff", "--format=json", ALPINE}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(session.IsJSONOutputValid()).To(BeTrue()) }) It("podman diff container and committed image", func() { session := podmanTest.Podman([]string{"run", "--name=diff-test", ALPINE, "touch", "/tmp/diff-test"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"diff", "diff-test"}) session.WaitWithDefaultTimeout() containerDiff := session.OutputToStringArray() @@ -67,7 +68,7 @@ var _ = Describe("Podman diff", func() { Expect(session.LineInOutputContains("A /tmp/diff-test")).To(BeTrue()) session = podmanTest.Podman([]string{"commit", "diff-test", "diff-test-img"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) session = podmanTest.Podman([]string{"diff", "diff-test-img"}) session.WaitWithDefaultTimeout() imageDiff := session.OutputToStringArray() @@ -78,7 +79,7 @@ var _ = Describe("Podman diff", func() { It("podman diff latest container", func() { session := podmanTest.Podman([]string{"run", "--name", "diff-test", ALPINE, "touch", "/tmp/diff-test"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) if !IsRemote() { session = podmanTest.Podman([]string{"diff", "-l"}) } else { @@ -89,7 +90,7 @@ var _ = Describe("Podman diff", func() { sort.Strings(containerDiff) Expect(session.LineInOutputContains("C /tmp")).To(BeTrue()) Expect(session.LineInOutputContains("A /tmp/diff-test")).To(BeTrue()) - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) }) It("podman image diff", func() { @@ -118,13 +119,13 @@ RUN echo test session := podmanTest.Podman([]string{"image", "diff", image}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 1)) Expect(session.OutputToString()).To(Equal("A " + file3)) session = podmanTest.Podman([]string{"image", "diff", image, baseImage}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 4)) Expect(session.LineInOutputContains("A " + file1)).To(BeTrue()) Expect(session.LineInOutputContains("A " + file2)).To(BeTrue()) @@ -134,20 +135,20 @@ RUN echo test It("podman image diff of single image", func() { session := podmanTest.Podman([]string{"image", "diff", BB}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 0)) }) It("podman image diff bogus image", func() { session := podmanTest.Podman([]string{"image", "diff", "1234", ALPINE}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(125)) + Expect(session).Should(Exit(125)) }) It("podman image diff of the same image", func() { session := podmanTest.Podman([]string{"image", "diff", ALPINE, ALPINE}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 0)) }) @@ -165,25 +166,25 @@ RUN touch %s`, ALPINE, imagefile) session := podmanTest.Podman([]string{"run", "--name", name, ALPINE, "touch", confile}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) // podman diff prefers image over container when they have the same name session = podmanTest.Podman([]string{"diff", name}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 2)) Expect(session.OutputToString()).To(ContainSubstring(imagefile)) session = podmanTest.Podman([]string{"image", "diff", name}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 2)) Expect(session.OutputToString()).To(ContainSubstring(imagefile)) // container diff has to show the container session = podmanTest.Podman([]string{"container", "diff", name}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + Expect(session).Should(Exit(0)) Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 2)) Expect(session.OutputToString()).To(ContainSubstring(confile)) }) |