e2e tests: clean up antihelpful BeTrue()s

Many ginkgo tests have been written to use this evil form:

    GrepString("foo")
    Expect(that to BeTrue())

...which yields horrible useless messages on failure:

    false is not true

Identify those (automatically, via script) and convert to:

    Expect(output to ContainSubstring("foo"))

...which yields:

    "this output" does not contain substring "foo"

There are still many BeTrue()s left. This is just a start.

This is commit 1 of 2. It includes the script I used, and
all changes to *.go are those computed by the script.
Commit 2 will apply some manual fixes.

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index b07e287ac..3ed8ef462 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -41,8 +41,8 @@ var _ = Describe("Podman images", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
-		Expect(session.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
-		Expect(session.LineInOutputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
+		Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/alpine")))
+		Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/busybox")))
 	})
 
 	It("podman image List", func() {
@@ -50,8 +50,8 @@ var _ = Describe("Podman images", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
-		Expect(session.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
-		Expect(session.LineInOutputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
+		Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/alpine")))
+		Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/busybox")))
 	})
 
 	It("podman images with multiple tags", func() {
@@ -86,8 +86,8 @@ var _ = Describe("Podman images", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
-		Expect(session.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
-		Expect(session.LineInOutputStartsWith("quay.io/libpod/busybox")).To(BeTrue())
+		Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/alpine")))
+		Expect(session.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/busybox")))
 	})
 
 	It("podman empty images list in JSON format", func() {
@@ -150,13 +150,13 @@ var _ = Describe("Podman images", func() {
 		retalpine.WaitWithDefaultTimeout()
 		Expect(retalpine).Should(Exit(0))
 		Expect(len(retalpine.OutputToStringArray())).To(Equal(6))
-		Expect(retalpine.LineInOutputContains("alpine")).To(BeTrue())
+		Expect(retalpine.OutputToString()).To(ContainSubstring("alpine"))
 
 		retalpine = podmanTest.Podman([]string{"images", "-f", "reference=alpine"})
 		retalpine.WaitWithDefaultTimeout()
 		Expect(retalpine).Should(Exit(0))
 		Expect(len(retalpine.OutputToStringArray())).To(Equal(6))
-		Expect(retalpine.LineInOutputContains("alpine")).To(BeTrue())
+		Expect(retalpine.OutputToString()).To(ContainSubstring("alpine"))
 
 		retnone := podmanTest.Podman([]string{"images", "-q", "-f", "reference=bogus"})
 		retnone.WaitWithDefaultTimeout()