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

diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 5ce4d9acf..0de2dbd65 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -681,21 +681,18 @@ VOLUME /test/`, ALPINE)
 		session := podmanTest.Podman([]string{"run", "--rm", "--user", "888:888", "-v", vol, ALPINE, "stat", "-c", "%u:%g", dest})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		found, _ := session.GrepString("888:888")
-		Expect(found).Should(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring("888:888"))
 
 		session = podmanTest.Podman([]string{"run", "--rm", "--user", "888:888", "--userns", "auto", "-v", vol, ALPINE, "stat", "-c", "%u:%g", dest})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		found, _ = session.GrepString("888:888")
-		Expect(found).Should(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring("888:888"))
 
 		vol = vol + ",O"
 		session = podmanTest.Podman([]string{"run", "--rm", "--user", "888:888", "--userns", "keep-id", "-v", vol, ALPINE, "stat", "-c", "%u:%g", dest})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		found, _ = session.GrepString("888:888")
-		Expect(found).Should(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring("888:888"))
 	})
 
 	It("podman run with --mount and U flag", func() {