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

diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index d64b28063..953380335 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Podman network", func() {
 		session := podmanTest.Podman([]string{"network", "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains(name)).To(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring(name))
 	})
 
 	It("podman network list -q", func() {
@@ -56,7 +56,7 @@ var _ = Describe("Podman network", func() {
 		session := podmanTest.Podman([]string{"network", "ls", "--quiet"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains(name)).To(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring(name))
 	})
 
 	It("podman network list --filter success", func() {
@@ -66,7 +66,7 @@ var _ = Describe("Podman network", func() {
 		session := podmanTest.Podman([]string{"network", "ls", "--filter", "driver=bridge"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains(name)).To(BeTrue())
+		Expect(session.OutputToString()).To(ContainSubstring(name))
 	})
 
 	It("podman network list --filter driver and name", func() {
@@ -200,7 +200,7 @@ var _ = Describe("Podman network", func() {
 			session := podmanTest.Podman([]string{"network", "ls", "--quiet"})
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(Exit(0))
-			Expect(session.LineInOutputContains(name)).To(BeTrue())
+			Expect(session.OutputToString()).To(ContainSubstring(name))
 
 			rm := podmanTest.Podman([]string{"network", rm, name})
 			rm.WaitWithDefaultTimeout()