From b3f38c31b29b51440edd5913a90019efbced0862 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 27 Apr 2022 14:58:46 -0600 Subject: 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 --- test/e2e/network_create_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/e2e/network_create_test.go') diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 82b99bd68..a6e927ca2 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -59,7 +59,7 @@ var _ = Describe("Podman network create", func() { Expect(err).To(BeNil()) Expect(results).To(HaveLen(1)) result := results[0] - Expect(result.Name).To(Equal(netName)) + Expect(result).To(HaveField("Name", netName)) Expect(result.Subnets).To(HaveLen(1)) Expect(result.Subnets[0].Subnet.String()).To(Equal("10.11.12.0/24")) Expect(result.Subnets[0].Gateway.String()).To(Equal("10.11.12.1")) @@ -102,7 +102,7 @@ var _ = Describe("Podman network create", func() { Expect(err).To(BeNil()) Expect(results).To(HaveLen(1)) result := results[0] - Expect(result.Name).To(Equal(netName)) + Expect(result).To(HaveField("Name", netName)) Expect(result.Subnets).To(HaveLen(1)) Expect(result.Subnets[0].Gateway.String()).To(Equal("fd00:1:2:3::1")) Expect(result.Subnets[0].Subnet.String()).To(Equal("fd00:1:2:3::/64")) @@ -141,7 +141,7 @@ var _ = Describe("Podman network create", func() { Expect(err).To(BeNil()) Expect(results).To(HaveLen(1)) result := results[0] - Expect(result.Name).To(Equal(netName)) + Expect(result).To(HaveField("Name", netName)) Expect(result.Subnets).To(HaveLen(2)) Expect(result.Subnets[0].Subnet.IP).ToNot(BeNil()) Expect(result.Subnets[1].Subnet.IP).ToNot(BeNil()) @@ -173,7 +173,7 @@ var _ = Describe("Podman network create", func() { Expect(err).To(BeNil()) Expect(results).To(HaveLen(1)) result = results[0] - Expect(result.Name).To(Equal(netName2)) + Expect(result).To(HaveField("Name", netName2)) Expect(result.Subnets).To(HaveLen(2)) Expect(result.Subnets[0].Subnet.IP).ToNot(BeNil()) Expect(result.Subnets[1].Subnet.IP).ToNot(BeNil()) -- cgit v1.2.3-54-g00ecf