From c0a8814fb4d55a950ebf2b2c48731ac939318d7e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 1 Dec 2021 08:49:55 -0700 Subject: Use HaveLen(x) instead of Expect(len(y)).To(Equal(x)) sed -i -e 's/Expect(len(\(.*\)))\.To(Equal(\(.*\)))/Expect(\1).To(HaveLen(\2))/' test/e2e/*.go Signed-off-by: Ed Santiago --- test/e2e/network_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/e2e/network_test.go') diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index d56cde9db..92f962abc 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -262,8 +262,8 @@ var _ = Describe("Podman network", func() { inspect.WaitWithDefaultTimeout() Expect(inspect).Should(Exit(0)) conData := inspect.InspectContainerToJSON() - Expect(len(conData)).To(Equal(1)) - Expect(len(conData[0].NetworkSettings.Networks)).To(Equal(1)) + Expect(conData).To(HaveLen(1)) + Expect(conData[0].NetworkSettings.Networks).To(HaveLen(1)) net, ok := conData[0].NetworkSettings.Networks[netName] Expect(ok).To(BeTrue()) Expect(net.NetworkID).To(Equal(netName)) @@ -298,8 +298,8 @@ var _ = Describe("Podman network", func() { inspect.WaitWithDefaultTimeout() Expect(inspect).Should(Exit(0)) conData := inspect.InspectContainerToJSON() - Expect(len(conData)).To(Equal(1)) - Expect(len(conData[0].NetworkSettings.Networks)).To(Equal(2)) + Expect(conData).To(HaveLen(1)) + Expect(conData[0].NetworkSettings.Networks).To(HaveLen(2)) net1, ok := conData[0].NetworkSettings.Networks[netName1] Expect(ok).To(BeTrue()) Expect(net1.NetworkID).To(Equal(netName1)) @@ -335,8 +335,8 @@ var _ = Describe("Podman network", func() { inspect.WaitWithDefaultTimeout() Expect(inspect).Should(Exit(0)) conData := inspect.InspectContainerToJSON() - Expect(len(conData)).To(Equal(1)) - Expect(len(conData[0].NetworkSettings.Networks)).To(Equal(2)) + Expect(conData).To(HaveLen(1)) + Expect(conData[0].NetworkSettings.Networks).To(HaveLen(2)) net1, ok := conData[0].NetworkSettings.Networks[netName1] Expect(ok).To(BeTrue()) Expect(net1.NetworkID).To(Equal(netName1)) -- cgit v1.2.3-54-g00ecf