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/container_create_volume_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/e2e/container_create_volume_test.go') diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index 572885fd6..df1d9a371 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -45,8 +45,8 @@ func checkDataVolumeContainer(pTest *PodmanTestIntegration, image, cont, dest, d Expect(create).Should(Exit(0)) inspect := pTest.InspectContainer(cont) - Expect(len(inspect)).To(Equal(1)) - Expect(len(inspect[0].Mounts)).To(Equal(1)) + Expect(inspect).To(HaveLen(1)) + Expect(inspect[0].Mounts).To(HaveLen(1)) Expect(inspect[0].Mounts[0].Destination).To(Equal(dest)) mntName, mntSource := inspect[0].Mounts[0].Name, inspect[0].Mounts[0].Source @@ -54,7 +54,7 @@ func checkDataVolumeContainer(pTest *PodmanTestIntegration, image, cont, dest, d volList := pTest.Podman([]string{"volume", "list", "--quiet"}) volList.WaitWithDefaultTimeout() Expect(volList).Should(Exit(0)) - Expect(len(volList.OutputToStringArray())).To(Equal(1)) + Expect(volList.OutputToStringArray()).To(HaveLen(1)) Expect(volList.OutputToStringArray()[0]).To(Equal(mntName)) // Check the mount source directory @@ -64,7 +64,7 @@ func checkDataVolumeContainer(pTest *PodmanTestIntegration, image, cont, dest, d if data == "" { Expect(files).To(BeEmpty()) } else { - Expect(len(files)).To(Equal(1)) + Expect(files).To(HaveLen(1)) Expect(files[0].Name()).To(Equal(data)) } } -- cgit v1.2.3-54-g00ecf