Ginkgo: use HaveField() for better error checking

This is a very late followup to my ginkgo-improving work of 2021.
It has been stuck since December because it requires gomega 1.17,
which we've just enabled.

This commit is simply a copy-paste of a command I saved in
my TODO list many months ago:

     sed -i -e 's/Expect(\([^ ]\+\)\.\([a-zA-Z0-9]\+\))\.To(Equal(/Expect(\1).To(HaveField(\"\2\", /' test/e2e/*_test.go

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

1 files changed, 11 insertions, 11 deletions

diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go
index 23f1a1dbf..a41c10162 100644
--- a/test/e2e/healthcheck_run_test.go
+++ b/test/e2e/healthcheck_run_test.go
@@ -168,7 +168,7 @@ var _ = Describe("Podman healthcheck run", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		inspect := podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal("starting"))
+		Expect(inspect[0].State.Health).To(HaveField("Status", "starting"))
 	})
 
 	It("podman healthcheck failed checks in start-period should not change status", func() {
@@ -189,9 +189,9 @@ var _ = Describe("Podman healthcheck run", func() {
 		Expect(hc).Should(Exit(1))
 
 		inspect := podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal("starting"))
+		Expect(inspect[0].State.Health).To(HaveField("Status", "starting"))
 		// test old podman compat (see #11645)
-		Expect(inspect[0].State.Healthcheck().Status).To(Equal("starting"))
+		Expect(inspect[0].State.Healthcheck()).To(HaveField("Status", "starting"))
 	})
 
 	It("podman healthcheck failed checks must reach retries before unhealthy ", func() {
@@ -204,16 +204,16 @@ var _ = Describe("Podman healthcheck run", func() {
 		Expect(hc).Should(Exit(1))
 
 		inspect := podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal("starting"))
+		Expect(inspect[0].State.Health).To(HaveField("Status", "starting"))
 
 		hc = podmanTest.Podman([]string{"healthcheck", "run", "hc"})
 		hc.WaitWithDefaultTimeout()
 		Expect(hc).Should(Exit(1))
 
 		inspect = podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal(define.HealthCheckUnhealthy))
+		Expect(inspect[0].State.Health).To(HaveField("Status", define.HealthCheckUnhealthy))
 		// test old podman compat (see #11645)
-		Expect(inspect[0].State.Healthcheck().Status).To(Equal(define.HealthCheckUnhealthy))
+		Expect(inspect[0].State.Healthcheck()).To(HaveField("Status", define.HealthCheckUnhealthy))
 	})
 
 	It("podman healthcheck good check results in healthy even in start-period", func() {
@@ -226,7 +226,7 @@ var _ = Describe("Podman healthcheck run", func() {
 		Expect(hc).Should(Exit(0))
 
 		inspect := podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal(define.HealthCheckHealthy))
+		Expect(inspect[0].State.Health).To(HaveField("Status", define.HealthCheckHealthy))
 	})
 
 	It("podman healthcheck unhealthy but valid arguments check", func() {
@@ -249,14 +249,14 @@ var _ = Describe("Podman healthcheck run", func() {
 		Expect(hc).Should(Exit(1))
 
 		inspect := podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal("starting"))
+		Expect(inspect[0].State.Health).To(HaveField("Status", "starting"))
 
 		hc = podmanTest.Podman([]string{"healthcheck", "run", "hc"})
 		hc.WaitWithDefaultTimeout()
 		Expect(hc).Should(Exit(1))
 
 		inspect = podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal(define.HealthCheckUnhealthy))
+		Expect(inspect[0].State.Health).To(HaveField("Status", define.HealthCheckUnhealthy))
 
 		foo := podmanTest.Podman([]string{"exec", "hc", "touch", "/foo"})
 		foo.WaitWithDefaultTimeout()
@@ -267,7 +267,7 @@ var _ = Describe("Podman healthcheck run", func() {
 		Expect(hc).Should(Exit(0))
 
 		inspect = podmanTest.InspectContainer("hc")
-		Expect(inspect[0].State.Health.Status).To(Equal(define.HealthCheckHealthy))
+		Expect(inspect[0].State.Health).To(HaveField("Status", define.HealthCheckHealthy))
 
 		// Test podman ps --filter heath is working (#11687)
 		ps := podmanTest.Podman([]string{"ps", "--filter", "health=healthy"})
@@ -328,6 +328,6 @@ HEALTHCHECK CMD ls -l / 2>&1`, ALPINE)
 		// Check to make sure a default time interval value was added
 		Expect(inspect[0].Config.Healthcheck.Interval).To(BeNumerically("==", 30000000000))
 		// Check to make sure characters were not coerced to utf8
-		Expect(inspect[0].Config.Healthcheck.Test).To(Equal([]string{"CMD-SHELL", "ls -l / 2>&1"}))
+		Expect(inspect[0].Config.Healthcheck).To(HaveField("Test", []string{"CMD-SHELL", "ls -l / 2>&1"}))
 	})
 })