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, 7 insertions, 7 deletions

diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go
index 65ec0d1de..71696f5b6 100644
--- a/test/e2e/diff_test.go
+++ b/test/e2e/diff_test.go
@@ -64,8 +64,8 @@ var _ = Describe("Podman diff", func() {
 		session.WaitWithDefaultTimeout()
 		containerDiff := session.OutputToStringArray()
 		sort.Strings(containerDiff)
-		Expect(session.LineInOutputContains("C /tmp")).To(BeTrue())
-		Expect(session.LineInOutputContains("A /tmp/diff-test")).To(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring("C /tmp"))
+		Expect(session.OutputToString()).To(ContainSubstring("A /tmp/diff-test"))
 		session = podmanTest.Podman([]string{"commit", "diff-test", "diff-test-img"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -88,8 +88,8 @@ var _ = Describe("Podman diff", func() {
 		session.WaitWithDefaultTimeout()
 		containerDiff := session.OutputToStringArray()
 		sort.Strings(containerDiff)
-		Expect(session.LineInOutputContains("C /tmp")).To(BeTrue())
-		Expect(session.LineInOutputContains("A /tmp/diff-test")).To(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring("C /tmp"))
+		Expect(session.OutputToString()).To(ContainSubstring("A /tmp/diff-test"))
 		Expect(session).Should(Exit(0))
 	})
 
@@ -127,9 +127,9 @@ RUN echo test
 		session.WaitWithDefaultTimeout()
 		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())
-		Expect(session.LineInOutputContains("A " + file3)).To(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring("A " + file1))
+		Expect(session.OutputToString()).To(ContainSubstring("A " + file2))
+		Expect(session.OutputToString()).To(ContainSubstring("A " + file3))
 	})
 
 	It("podman image diff of single image", func() {