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

diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index a3ee1814a..e79c1eb8a 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -214,7 +214,7 @@ var _ = Describe("Podman load", func() {
 		result := podmanTest.Podman([]string{"images", "hello:world"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.LineInOutputContains("docker")).To(Not(BeTrue()))
-		Expect(result.LineInOutputContains("localhost")).To(BeTrue())
+		Expect(result.OutputToString()).To(ContainSubstring("localhost"))
 	})
 
 	It("podman load localhost registry from scratch and :latest", func() {
@@ -239,7 +239,7 @@ var _ = Describe("Podman load", func() {
 		result := podmanTest.Podman([]string{"images", "hello:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.LineInOutputContains("docker")).To(Not(BeTrue()))
-		Expect(result.LineInOutputContains("localhost")).To(BeTrue())
+		Expect(result.OutputToString()).To(ContainSubstring("localhost"))
 	})
 
 	It("podman load localhost registry from dir", func() {
@@ -265,7 +265,7 @@ var _ = Describe("Podman load", func() {
 		result := podmanTest.Podman([]string{"images", "load:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.LineInOutputContains("docker")).To(Not(BeTrue()))
-		Expect(result.LineInOutputContains("localhost")).To(BeTrue())
+		Expect(result.OutputToString()).To(ContainSubstring("localhost"))
 	})
 
 	It("podman load xz compressed image", func() {
@@ -290,7 +290,7 @@ var _ = Describe("Podman load", func() {
 		result := podmanTest.Podman([]string{"load", "-i", "./testdata/docker-two-images.tar.xz"})
 		result.WaitWithDefaultTimeout()
 		Expect(result).Should(Exit(0))
-		Expect(result.LineInOutputContains("example.com/empty:latest")).To(BeTrue())
-		Expect(result.LineInOutputContains("example.com/empty/but:different")).To(BeTrue())
+		Expect(result.OutputToString()).To(ContainSubstring("example.com/empty:latest"))
+		Expect(result.OutputToString()).To(ContainSubstring("example.com/empty/but:different"))
 	})
 })