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/trust_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/e2e/trust_test.go') diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index e02bfa7f2..9909c0653 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -43,7 +43,7 @@ var _ = Describe("Podman trust", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) outArray := session.OutputToStringArray() - Expect(len(outArray)).To(Equal(3)) + Expect(outArray).To(HaveLen(3)) // Repository order is not guaranteed. So, check that // all expected lines appear in output; we also check total number of lines, so that handles all of them. @@ -79,7 +79,7 @@ var _ = Describe("Podman trust", func() { Expect(session.OutputToString()).To(BeValidJSON()) var teststruct []map[string]string json.Unmarshal(session.Out.Contents(), &teststruct) - Expect(len(teststruct)).To(Equal(3)) + Expect(teststruct).To(HaveLen(3)) // To ease comparison, group the unordered array of repos by repo (and we expect only one entry by repo, so order within groups doesn’t matter) repoMap := map[string][]map[string]string{} for _, e := range teststruct { -- cgit v1.2.3-54-g00ecf