e2e: yet more cleanup of BeTrue/BeFalse

Thanks to Paul for teaching me about HaveKey()

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

21 files changed, 67 insertions, 109 deletions

diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index e068a6582..5a2640f33 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -192,7 +192,7 @@ var _ = Describe("Podman checkpoint", func() {
 		ps.WaitWithDefaultTimeout()
 		Expect(ps).Should(Exit(0))
 		Expect(ps.OutputToString()).To(ContainSubstring(session1.OutputToString()))
-		Expect(ps.LineInOutputContains(session2.OutputToString())).To(BeFalse())
+		Expect(ps.OutputToString()).To(Not(ContainSubstring(session2.OutputToString())))
 
 		result = podmanTest.Podman([]string{"container", "restore", "second"})
 		result.WaitWithDefaultTimeout()
@@ -228,8 +228,8 @@ var _ = Describe("Podman checkpoint", func() {
 		ps := podmanTest.Podman([]string{"ps", "-q", "--no-trunc"})
 		ps.WaitWithDefaultTimeout()
 		Expect(ps).Should(Exit(0))
-		Expect(ps.LineInOutputContains(session1.OutputToString())).To(BeFalse())
-		Expect(ps.LineInOutputContains(session2.OutputToString())).To(BeFalse())
+		Expect(ps.OutputToString()).To(Not(ContainSubstring(session1.OutputToString())))
+		Expect(ps.OutputToString()).To(Not(ContainSubstring(session2.OutputToString())))
 
 		result = podmanTest.Podman([]string{"container", "restore", "-a"})
 		result.WaitWithDefaultTimeout()
@@ -1297,8 +1297,8 @@ var _ = Describe("Podman checkpoint", func() {
 		})
 		ps.WaitWithDefaultTimeout()
 		Expect(ps).Should(Exit(0))
-		Expect(ps.LineInOutputContains(session1.OutputToString())).To(BeFalse())
-		Expect(ps.LineInOutputContains(session2.OutputToString())).To(BeFalse())
+		Expect(ps.OutputToString()).To(Not(ContainSubstring(session1.OutputToString())))
+		Expect(ps.OutputToString()).To(Not(ContainSubstring(session2.OutputToString())))
 
 		result = podmanTest.Podman([]string{
 			"container",
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index b751c338f..a09666468 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -204,8 +204,7 @@ var _ = Describe("Podman commit", func() {
 		inspect.WaitWithDefaultTimeout()
 		Expect(inspect).Should(Exit(0))
 		image := inspect.InspectImageJSON()
-		_, ok := image[0].Config.Volumes["/foo"]
-		Expect(ok).To(BeFalse())
+		Expect(image[0].Config.Volumes).To(Not(HaveKey("/foo")))
 	})
 
 	It("podman commit with volume mounts and --include-volumes", func() {
@@ -224,8 +223,7 @@ var _ = Describe("Podman commit", func() {
 		inspect.WaitWithDefaultTimeout()
 		Expect(inspect).Should(Exit(0))
 		image := inspect.InspectImageJSON()
-		_, ok := image[0].Config.Volumes["/foo"]
-		Expect(ok).To(BeTrue(), ".Config.Volumes[/foo]")
+		Expect(image[0].Config.Volumes).To(HaveKey("/foo"))
 
 		r := podmanTest.Podman([]string{"run", "newimage"})
 		r.WaitWithDefaultTimeout()
@@ -250,7 +248,7 @@ var _ = Describe("Podman commit", func() {
 		for _, v := range image[0].Config.Env {
 			envMap[v] = true
 		}
-		Expect(envMap["TEST=1=1-01=9.01"]).To(BeTrue(), "envMap[TEST=1=1-01=9.01]")
+		Expect(envMap).To(HaveKey("TEST=1=1-01=9.01"))
 	})
 
 	It("podman commit container and print id to external file", func() {
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index 6bc230aae..2a6f177f2 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -245,7 +245,7 @@ var _ = Describe("Podman run", func() {
 		session := podmanTest.Podman([]string{"run", "--dns-search=.", ALPINE, "cat", "/etc/resolv.conf"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputStartsWith("search")).To(BeFalse())
+		Expect(session.OutputToStringArray()).To(Not(ContainElement(HavePrefix("search"))))
 	})
 
 	It("podman run use containers.conf search domain", func() {
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 52d439f4a..321361382 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -107,9 +107,7 @@ var _ = Describe("Podman create", func() {
 		check := podmanTest.Podman([]string{"inspect", "annotate_test"})
 		check.WaitWithDefaultTimeout()
 		data := check.InspectContainerToJSON()
-		value, ok := data[0].Config.Annotations["HELLO"]
-		Expect(ok).To(BeTrue(), ".Config.Annotations[HELLO]")
-		Expect(value).To(Equal("WORLD"))
+		Expect(data[0].Config.Annotations).To(HaveKeyWithValue("HELLO", "WORLD"))
 	})
 
 	It("podman create --entrypoint command", func() {
@@ -386,10 +384,8 @@ var _ = Describe("Podman create", func() {
 		data := inspect.InspectContainerToJSON()
 		Expect(len(data)).To(Equal(1), "len(InspectContainerToJSON)")
 		Expect(len(data[0].Config.Labels)).To(Equal(2))
-		_, ok1 := data[0].Config.Labels["TESTKEY1"]
-		Expect(ok1).To(BeTrue(), ".Config.Labels[TESTKEY1]")
-		_, ok2 := data[0].Config.Labels["TESTKEY2"]
-		Expect(ok2).To(BeTrue(), ".Config.Labels[TESTKEY2]")
+		Expect(data[0].Config.Labels).To(HaveKey("TESTKEY1"))
+		Expect(data[0].Config.Labels).To(HaveKey("TESTKEY2"))
 	})
 
 	It("podman create with set label", func() {
@@ -404,12 +400,8 @@ var _ = Describe("Podman create", func() {
 		data := inspect.InspectContainerToJSON()
 		Expect(len(data)).To(Equal(1))
 		Expect(len(data[0].Config.Labels)).To(Equal(2))
-		val1, ok1 := data[0].Config.Labels["TESTKEY1"]
-		Expect(ok1).To(BeTrue(), ".Config.Labels[TESTKEY1]")
-		Expect(val1).To(Equal("value1"))
-		val2, ok2 := data[0].Config.Labels["TESTKEY2"]
-		Expect(ok2).To(BeTrue(), ".Config.Labels[TESTKEY2]")
-		Expect(val2).To(Equal("bar"))
+		Expect(data[0].Config.Labels).To(HaveKeyWithValue("TESTKEY1", "value1"))
+		Expect(data[0].Config.Labels).To(HaveKeyWithValue("TESTKEY2", "bar"))
 	})
 
 	It("podman create with --restart=on-failure:5 parses correctly", func() {
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 62482598a..735334eec 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -606,9 +606,7 @@ var _ = Describe("Podman generate kube", func() {
 		pod := new(v1.Pod)
 		err = yaml.Unmarshal(b, pod)
 		Expect(err).To(BeNil())
-		val, found := pod.Annotations[define.BindMountPrefix+vol1]
-		Expect(found).To(BeTrue(), "pod.Annotations["+vol1+"]")
-		Expect(val).To(HaveSuffix("z"))
+		Expect(pod.Annotations).To(HaveKeyWithValue(define.BindMountPrefix+vol1, HaveSuffix("z")))
 
 		rm := podmanTest.Podman([]string{"pod", "rm", "-t", "0", "-f", "test1"})
 		rm.WaitWithDefaultTimeout()
@@ -1071,9 +1069,7 @@ USER test1`
 		err := yaml.Unmarshal(kube.Out.Contents(), pod)
 		Expect(err).To(BeNil())
 
-		v, ok := pod.GetAnnotations()["io.containers.autoupdate/top"]
-		Expect(ok).To(Equal(true))
-		Expect(v).To(Equal("local"))
+		Expect(pod.GetAnnotations()).To(HaveKeyWithValue("io.containers.autoupdate/top", "local"))
 	})
 
 	It("podman generate kube on pod with auto update labels in all containers", func() {
@@ -1100,13 +1096,8 @@ USER test1`
 		Expect(pod.Spec.Containers[1].WorkingDir).To(Equal("/root"))
 
 		for _, ctr := range []string{"top1", "top2"} {
-			v, ok := pod.GetAnnotations()["io.containers.autoupdate/"+ctr]
-			Expect(ok).To(Equal(true))
-			Expect(v).To(Equal("registry"))
-
-			v, ok = pod.GetAnnotations()["io.containers.autoupdate.authfile/"+ctr]
-			Expect(ok).To(Equal(true))
-			Expect(v).To(Equal("/some/authfile.json"))
+			Expect(pod.GetAnnotations()).To(HaveKeyWithValue("io.containers.autoupdate/"+ctr, "registry"))
+			Expect(pod.GetAnnotations()).To(HaveKeyWithValue("io.containers.autoupdate.authfile/"+ctr, "/some/authfile.json"))
 		}
 	})
 })
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index 8e21ca606..9cc04e6b0 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -229,11 +229,10 @@ WORKDIR /test
 			result.WaitWithDefaultTimeout()
 			Expect(result).Should(Exit(0))
 
-			found, _ := result.GrepString("<none>")
 			if noneTag {
-				Expect(found).To(BeTrue())
+				Expect(result.OutputToString()).To(ContainSubstring("<none>"))
 			} else {
-				Expect(found).To(BeFalse())
+				Expect(result.OutputToString()).To(Not(ContainSubstring("<none>")))
 			}
 		}
 		// No "<none>" tag as tagged alpine instances should be present.
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index ad5634e0c..ac70ebd8c 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -160,8 +160,7 @@ var _ = Describe("Podman load", func() {
 		Expect(result).Should(Exit(125))
 
 		errMsg := fmt.Sprintf("remote client supports archives only but %q is a directory", podmanTest.TempDir)
-		found, _ := result.ErrorGrepString(errMsg)
-		Expect(found).Should(BeTrue())
+		Expect(result.ErrorToString()).To(ContainSubstring(errMsg))
 	})
 
 	It("podman load bogus file", func() {
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index ff306f0f8..d56cde9db 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -140,7 +140,7 @@ var _ = Describe("Podman network", func() {
 		session := podmanTest.Podman([]string{"network", "ls", "--filter", "label=abc"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains(name)).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring(name)))
 	})
 
 	It("podman network ID test", func() {
@@ -208,7 +208,7 @@ var _ = Describe("Podman network", func() {
 			results := podmanTest.Podman([]string{"network", "ls", "--quiet"})
 			results.WaitWithDefaultTimeout()
 			Expect(results).Should(Exit(0))
-			Expect(results.LineInOutputContains(name)).To(BeFalse())
+			Expect(results.OutputToString()).To(Not(ContainSubstring(name)))
 		})
 	}
 
diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go
index 223fcc5b2..6b0081171 100644
--- a/test/e2e/prune_test.go
+++ b/test/e2e/prune_test.go
@@ -98,8 +98,7 @@ var _ = Describe("Podman prune", func() {
 		session := podmanTest.Podman([]string{"images", "-a"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		hasNone, _ := session.GrepString("<none>")
-		Expect(hasNone).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("<none>")))
 		numImages := len(session.OutputToStringArray())
 
 		// Since there's no dangling image, none should be removed.
@@ -125,8 +124,7 @@ var _ = Describe("Podman prune", func() {
 		session = podmanTest.Podman([]string{"images", "-a"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		hasNone, _ = session.GrepString("<none>")
-		Expect(hasNone).To(BeTrue()) // ! we have dangling ones
+		Expect(session.OutputToString()).To(ContainSubstring("<none>"))
 		numImages = len(session.OutputToStringArray())
 
 		// Since there's at least one dangling image, prune should
@@ -135,7 +133,7 @@ var _ = Describe("Podman prune", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		numPrunedImages := len(session.OutputToStringArray())
-		Expect(numPrunedImages >= 1).To(BeTrue())
+		Expect(numPrunedImages).To(BeNumerically(">=", 1), "numPrunedImages")
 
 		// Now make sure that exactly the number of pruned images has
 		// been removed.
@@ -189,11 +187,11 @@ var _ = Describe("Podman prune", func() {
 
 		after := podmanTest.Podman([]string{"images", "-a"})
 		after.WaitWithDefaultTimeout()
-		Expect(none).Should(Exit(0))
-		hasNoneAfter, result := none.GrepString("<none>")
+		Expect(after).Should(Exit(0))
+		hasNoneAfter, result := after.GrepString("<none>")
 		Expect(hasNoneAfter).To(BeTrue())
-		Expect(len(after.OutputToStringArray()) > 1).To(BeTrue())
-		Expect(len(result) > 0).To(BeTrue())
+		Expect(len(after.OutputToStringArray())).To(BeNumerically(">", 1))
+		Expect(len(result)).To(BeNumerically(">", 0))
 	})
 
 	It("podman image prune unused images", func() {
diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go
index 6a61c1292..f85a74f47 100644
--- a/test/e2e/restart_test.go
+++ b/test/e2e/restart_test.go
@@ -154,8 +154,8 @@ var _ = Describe("Podman restart", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		timeSince := time.Since(startTime)
-		Expect(timeSince < 10*time.Second).To(BeTrue())
-		Expect(timeSince > 2*time.Second).To(BeTrue())
+		Expect(timeSince).To(BeNumerically("<", 10*time.Second))
+		Expect(timeSince).To(BeNumerically(">", 2*time.Second))
 	})
 
 	It("Podman restart --all", func() {
diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go
index 4f6d974fd..2c2a9688e 100644
--- a/test/e2e/rmi_test.go
+++ b/test/e2e/rmi_test.go
@@ -276,8 +276,7 @@ RUN find $LOCAL
 		session := podmanTest.Podman([]string{"image", "rm"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(125))
-		match, _ := session.ErrorGrepString("image name or ID must be specified")
-		Expect(match).To(BeTrue())
+		Expect(session.ErrorToString()).To(ContainSubstring("image name or ID must be specified"))
 	})
 
 	It("podman image rm - concurrent with shared layers", func() {
diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go
index beb6390e0..8b6d535e5 100644
--- a/test/e2e/run_dns_test.go
+++ b/test/e2e/run_dns_test.go
@@ -44,7 +44,7 @@ var _ = Describe("Podman run dns", func() {
 		session := podmanTest.Podman([]string{"run", "--dns-search=.", ALPINE, "cat", "/etc/resolv.conf"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputStartsWith("search")).To(BeFalse())
+		Expect(session.OutputToStringArray()).To(Not(ContainElement(HavePrefix("search"))))
 	})
 
 	It("podman run add bad dns server", func() {
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go
index f500a3c7c..29f76bad1 100644
--- a/test/e2e/run_entrypoint_test.go
+++ b/test/e2e/run_entrypoint_test.go
@@ -129,6 +129,6 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
 		session := podmanTest.Podman([]string{"run", "--entrypoint=uname", "foobar.com/entrypoint:latest", "-r"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputStartsWith("Linux")).To(BeFalse())
+		Expect(session.OutputToStringArray()).To(Not(ContainElement(HavePrefix("Linux"))))
 	})
 })
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index c0840c83b..22ec27346 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -551,8 +551,7 @@ EXPOSE 2004-2005/tcp`, ALPINE)
 		session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "HOSTNAME"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		match, _ := session.GrepString(hostname)
-		Expect(match).Should(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring(hostname)))
 	})
 
 	It("podman run --net host hostname test", func() {
@@ -866,7 +865,6 @@ EXPOSE 2004-2005/tcp`, ALPINE)
 		inspectOut := podmanTest.InspectContainer(ctrName)
 		Expect(len(inspectOut)).To(Equal(1))
 		Expect(len(inspectOut[0].NetworkSettings.Networks)).To(Equal(1))
-		_, ok := inspectOut[0].NetworkSettings.Networks["podman"]
-		Expect(ok).To(BeTrue())
+		Expect(inspectOut[0].NetworkSettings.Networks).To(HaveKey("podman"))
 	})
 })
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go
index 05cdc7d80..6d1d26914 100644
--- a/test/e2e/run_passwd_test.go
+++ b/test/e2e/run_passwd_test.go
@@ -38,20 +38,20 @@ var _ = Describe("Podman run passwd", func() {
 		session := podmanTest.Podman([]string{"run", "--read-only", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("passwd")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("passwd")))
 	})
 	It("podman run user specified in container", func() {
 		session := podmanTest.Podman([]string{"run", "--read-only", "-u", "bin", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("passwd")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("passwd")))
 	})
 
 	It("podman run UID specified in container", func() {
 		session := podmanTest.Podman([]string{"run", "--read-only", "-u", "2:1", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("passwd")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("passwd")))
 	})
 
 	It("podman run UID not specified in container", func() {
@@ -77,14 +77,14 @@ USER 1000`, ALPINE)
 		session := podmanTest.Podman([]string{"run", "--read-only", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("/etc/group")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("/etc/group")))
 	})
 
 	It("podman run group specified in container", func() {
 		session := podmanTest.Podman([]string{"run", "--read-only", "-u", "root:bin", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("/etc/group")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("/etc/group")))
 	})
 
 	It("podman run non-numeric group not specified in container", func() {
@@ -97,7 +97,7 @@ USER 1000`, ALPINE)
 		session := podmanTest.Podman([]string{"run", "--read-only", "-u", "root:11", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("/etc/group")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("/etc/group")))
 	})
 
 	It("podman run numeric group not specified in container", func() {
diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go
index 321bf27ac..f1084a3d2 100644
--- a/test/e2e/run_privileged_test.go
+++ b/test/e2e/run_privileged_test.go
@@ -63,9 +63,7 @@ var _ = Describe("Podman privileged container tests", func() {
 		session := podmanTest.Podman([]string{"run", "--privileged", BB, "mount"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		ok, lines := session.GrepString("sysfs")
-		Expect(ok).To(BeTrue())
-		Expect(lines[0]).To(ContainSubstring("sysfs (rw,"))
+		Expect(session.OutputToString()).To(ContainSubstring("sysfs (rw,"))
 	})
 
 	It("podman privileged CapEff", func() {
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go
index 49f456366..6bb325155 100644
--- a/test/e2e/run_signal_test.go
+++ b/test/e2e/run_signal_test.go
@@ -116,8 +116,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
 		}
 		session, pid := podmanTest.PodmanPID([]string{"run", "--name", "test2", "--sig-proxy=false", fedoraMinimal, "bash", "-c", sigCatch2})
 
-		ok := WaitForContainer(podmanTest)
-		Expect(ok).To(BeTrue())
+		Expect(WaitForContainer(podmanTest)).To(BeTrue(), "WaitForContainer()")
 
 		// Kill with given signal
 		// Should be no output, SIGPOLL is usually ignored
@@ -132,8 +131,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
 
 		session.WaitWithDefaultTimeout()
 		Expect(session).To(ExitWithError())
-		ok, _ = session.GrepString("Received")
-		Expect(ok).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("Received")))
 	})
 
 })
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 6c47e9179..3d4c1240e 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -871,7 +871,7 @@ USER bin`, BB)
 		session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "id"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.LineInOutputContains("27(video),777,65533(nogroup)")).To(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("27(video),777,65533(nogroup)")))
 	})
 
 	It("podman run with group-add", func() {
@@ -1151,8 +1151,7 @@ USER mail`, BB)
 		session := podmanTest.Podman([]string{"run", "--volume", vol1 + ":/myvol1:z", "--volume", vol2 + ":/myvol2:z", fedoraMinimal, "findmnt", "-o", "TARGET,PROPAGATION"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		match, _ := session.GrepString("shared")
-		Expect(match).Should(BeFalse())
+		Expect(session.OutputToString()).To(Not(ContainSubstring("shared")))
 	})
 
 	It("podman run findmnt shared", func() {
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 10c191bd9..74aa69c96 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -103,10 +103,8 @@ var _ = Describe("Podman run with volumes", func() {
 		session = podmanTest.Podman([]string{"run", "--rm", "--mount", mount + ",consistency=delegated,shared", ALPINE, "grep", dest, "/proc/self/mountinfo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		found, matches := session.GrepString(dest)
-		Expect(found).Should(BeTrue())
-		Expect(matches[0]).To(ContainSubstring("rw"))
-		Expect(matches[0]).To(ContainSubstring("shared"))
+		Expect(session.OutputToString()).To(ContainSubstring("rw"))
+		Expect(session.OutputToString()).To(ContainSubstring("shared"))
 
 		session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=" + dest, ALPINE, "grep", dest, "/proc/self/mountinfo"})
 		session.WaitWithDefaultTimeout()
@@ -195,20 +193,18 @@ var _ = Describe("Podman run with volumes", func() {
 		session := podmanTest.Podman([]string{"run", "--rm", "-v", mountPath + ":" + dest + ":suid,dev,exec", ALPINE, "grep", dest, "/proc/self/mountinfo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		found, matches := session.GrepString(dest)
-		Expect(found).Should(BeTrue())
-		Expect(matches[0]).To(Not(ContainSubstring("noexec")))
-		Expect(matches[0]).To(Not(ContainSubstring("nodev")))
-		Expect(matches[0]).To(Not(ContainSubstring("nosuid")))
+		output := session.OutputToString()
+		Expect(output).To(Not(ContainSubstring("noexec")))
+		Expect(output).To(Not(ContainSubstring("nodev")))
+		Expect(output).To(Not(ContainSubstring("nosuid")))
 
 		session = podmanTest.Podman([]string{"run", "--rm", "--tmpfs", dest + ":suid,dev,exec", ALPINE, "grep", dest, "/proc/self/mountinfo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		found, matches = session.GrepString(dest)
-		Expect(found).Should(BeTrue())
-		Expect(matches[0]).To(Not(ContainSubstring("noexec")))
-		Expect(matches[0]).To(Not(ContainSubstring("nodev")))
-		Expect(matches[0]).To(Not(ContainSubstring("nosuid")))
+		output = session.OutputToString()
+		Expect(output).To(Not(ContainSubstring("noexec")))
+		Expect(output).To(Not(ContainSubstring("nodev")))
+		Expect(output).To(Not(ContainSubstring("nosuid")))
 	})
 
 	// Container should start when workdir is overlay volume
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 54bc5252e..c67ef7ed2 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"regexp"
 	"strconv"
 	"text/template"
 
@@ -107,10 +106,8 @@ registries = ['{{.Host}}:{{.Port}}']`
 		search.WaitWithDefaultTimeout()
 		Expect(search).Should(Exit(0))
 		output := string(search.Out.Contents())
-		match, _ := regexp.MatchString(`(?m)NAME\s+DESCRIPTION$`, output)
-		Expect(match).To(BeTrue())
-		match, _ = regexp.MatchString(`(?m)quay.io/libpod/whalesay\s+Static image used for automated testing.+$`, output)
-		Expect(match).To(BeTrue())
+		Expect(output).To(MatchRegexp(`(?m)NAME\s+DESCRIPTION$`))
+		Expect(output).To(MatchRegexp(`(?m)quay.io/libpod/whalesay\s+Static image used for automated testing.+$`))
 	})
 
 	It("podman search image with --compatible", func() {
@@ -118,8 +115,7 @@ registries = ['{{.Host}}:{{.Port}}']`
 		search.WaitWithDefaultTimeout()
 		Expect(search).Should(Exit(0))
 		output := string(search.Out.Contents())
-		match, _ := regexp.MatchString(`(?m)NAME\s+DESCRIPTION\s+STARS\s+OFFICIAL\s+AUTOMATED$`, output)
-		Expect(match).To(BeTrue())
+		Expect(output).To(MatchRegexp(`(?m)NAME\s+DESCRIPTION\s+STARS\s+OFFICIAL\s+AUTOMATED$`))
 	})
 
 	It("podman search format flag", func() {
@@ -354,8 +350,7 @@ registries = ['{{.Host}}:{{.Port}}']`
 
 		Expect(search).Should(Exit(125))
 		Expect(search.OutputToString()).Should(BeEmpty())
-		match, _ := search.ErrorGrepString("error")
-		Expect(match).Should(BeTrue())
+		Expect(search.ErrorToString()).To(ContainSubstring("error"))
 
 		// cleanup
 		resetRegistriesConfigEnv()
@@ -397,8 +392,7 @@ registries = ['{{.Host}}:{{.Port}}']`
 
 		Expect(search).Should(Exit(125))
 		Expect(search.OutputToString()).Should(BeEmpty())
-		match, _ := search.ErrorGrepString("error")
-		Expect(match).Should(BeTrue())
+		Expect(search.ErrorToString()).To(ContainSubstring("error"))
 
 		// cleanup
 		resetRegistriesConfigEnv()
@@ -451,8 +445,7 @@ registries = ['{{.Host}}:{{.Port}}']`
 
 		Expect(search).Should(Exit(125))
 		Expect(search.OutputToString()).Should(BeEmpty())
-		match, _ := search.ErrorGrepString("error")
-		Expect(match).Should(BeTrue())
+		Expect(search.ErrorToString()).To(ContainSubstring("error"))
 
 		// cleanup
 		resetRegistriesConfigEnv()
@@ -474,7 +467,7 @@ registries = ['{{.Host}}:{{.Port}}']`
 		search = podmanTest.Podman([]string{"search", "registry.redhat.io/*openshift*"})
 		search.WaitWithDefaultTimeout()
 		Expect(search).Should(Exit(0))
-		Expect(len(search.OutputToStringArray()) > 1).To(BeTrue())
+		Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 1))
 	})
 
 	It("podman search repository tags", func() {
@@ -494,7 +487,7 @@ registries = ['{{.Host}}:{{.Port}}']`
 
 		search = podmanTest.Podman([]string{"search", "--list-tags", "docker.io/library/"})
 		search.WaitWithDefaultTimeout()
-		Expect(len(search.OutputToStringArray()) == 0).To(BeTrue())
+		Expect(search.OutputToStringArray()).To(BeEmpty())
 	})
 
 	It("podman search with limit over 100", func() {
diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go
index 0119e0f7a..a05c1b593 100644
--- a/test/e2e/volume_rm_test.go
+++ b/test/e2e/volume_rm_test.go
@@ -127,6 +127,6 @@ var _ = Describe("Podman volume rm", func() {
 		session = podmanTest.Podman([]string{"volume", "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(len(session.OutputToStringArray()) >= 2).To(BeTrue())
+		Expect(len(session.OutputToStringArray())).To(BeNumerically(">=", 2))
 	})
 })