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/build_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/e2e/build_test.go') diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 5e93f9078..9a9dec191 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -139,7 +139,7 @@ var _ = Describe("Podman build", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) // Check for two layers - Expect(len(strings.Fields(session.OutputToString()))).To(Equal(2)) + Expect(strings.Fields(session.OutputToString())).To(HaveLen(2)) session = podmanTest.Podman([]string{"build", "--pull-never", "-f", "build/squash/Dockerfile.squash-b", "--squash", "-t", "test-squash-b:latest", "build/squash"}) session.WaitWithDefaultTimeout() @@ -149,7 +149,7 @@ var _ = Describe("Podman build", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) // Check for three layers - Expect(len(strings.Fields(session.OutputToString()))).To(Equal(3)) + Expect(strings.Fields(session.OutputToString())).To(HaveLen(3)) session = podmanTest.Podman([]string{"build", "--pull-never", "-f", "build/squash/Dockerfile.squash-c", "--squash", "-t", "test-squash-c:latest", "build/squash"}) session.WaitWithDefaultTimeout() @@ -159,7 +159,7 @@ var _ = Describe("Podman build", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) // Check for two layers - Expect(len(strings.Fields(session.OutputToString()))).To(Equal(2)) + Expect(strings.Fields(session.OutputToString())).To(HaveLen(2)) session = podmanTest.Podman([]string{"build", "--pull-never", "-f", "build/squash/Dockerfile.squash-c", "--squash-all", "-t", "test-squash-d:latest", "build/squash"}) session.WaitWithDefaultTimeout() @@ -169,7 +169,7 @@ var _ = Describe("Podman build", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) // Check for one layers - Expect(len(strings.Fields(session.OutputToString()))).To(Equal(1)) + Expect(strings.Fields(session.OutputToString())).To(HaveLen(1)) session = podmanTest.Podman([]string{"rm", "-a"}) session.WaitWithDefaultTimeout() -- cgit v1.2.3-54-g00ecf