diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-12-01 08:49:55 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-12-02 07:54:53 -0700 |
| commit | c0a8814fb4d55a950ebf2b2c48731ac939318d7e (patch) | |
| tree | de7c1c548a5b9486333fe6417bbb659d28dbec33 /test/e2e/pod_infra_container_test.go | |
| parent | 92f9e117670bb060307aadbd6bdeee303923091c (diff) | |
| download | podman-c0a8814fb4d55a950ebf2b2c48731ac939318d7e.tar.gz podman-c0a8814fb4d55a950ebf2b2c48731ac939318d7e.tar.bz2 podman-c0a8814fb4d55a950ebf2b2c48731ac939318d7e.zip | |
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 <santiago@redhat.com>
Diffstat (limited to 'test/e2e/pod_infra_container_test.go')
| -rw-r--r-- | test/e2e/pod_infra_container_test.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index 6d57c3887..4a5a8c6b0 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -43,11 +43,11 @@ var _ = Describe("Podman pod create", func() { check := podmanTest.Podman([]string{"pod", "ps", "-q", "--no-trunc"}) check.WaitWithDefaultTimeout() Expect(check.OutputToString()).To(ContainSubstring(podID)) - Expect(len(check.OutputToStringArray())).To(Equal(1)) + Expect(check.OutputToStringArray()).To(HaveLen(1)) check = podmanTest.Podman([]string{"ps", "-qa", "--no-trunc"}) check.WaitWithDefaultTimeout() - Expect(len(check.OutputToStringArray())).To(Equal(1)) + Expect(check.OutputToStringArray()).To(HaveLen(1)) }) It("podman start infra container", func() { @@ -63,7 +63,7 @@ var _ = Describe("Podman pod create", func() { check := podmanTest.Podman([]string{"ps", "-qa", "--no-trunc", "--filter", "status=running"}) check.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(check.OutputToStringArray())).To(Equal(1)) + Expect(check.OutputToStringArray()).To(HaveLen(1)) }) It("podman start infra container different image", func() { @@ -95,13 +95,13 @@ var _ = Describe("Podman pod create", func() { check := podmanTest.Podman([]string{"ps", "-a", "--no-trunc", "--ns", "--format", "{{.Namespaces.IPC}} {{.Namespaces.NET}}"}) check.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(check.OutputToStringArray())).To(Equal(2)) + Expect(check.OutputToStringArray()).To(HaveLen(2)) Expect(check.OutputToStringArray()[0]).To(Equal(check.OutputToStringArray()[1])) check = podmanTest.Podman([]string{"ps", "-a", "--no-trunc", "--ns", "--format", "{{.IPC}} {{.NET}}"}) check.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(check.OutputToStringArray())).To(Equal(2)) + Expect(check.OutputToStringArray()).To(HaveLen(2)) Expect(check.OutputToStringArray()[0]).To(Equal(check.OutputToStringArray()[1])) }) @@ -169,7 +169,7 @@ var _ = Describe("Podman pod create", func() { check.WaitWithDefaultTimeout() Expect(check).Should(Exit(0)) PIDs := check.OutputToStringArray() - Expect(len(PIDs)).To(Equal(3)) + Expect(PIDs).To(HaveLen(3)) ctrPID, _ := strconv.Atoi(PIDs[1]) infraPID, _ := strconv.Atoi(PIDs[2]) @@ -243,13 +243,13 @@ var _ = Describe("Podman pod create", func() { check.WaitWithDefaultTimeout() Expect(check).Should(Exit(0)) outputArray := check.OutputToStringArray() - Expect(len(outputArray)).To(Equal(2)) + Expect(outputArray).To(HaveLen(2)) check = podmanTest.Podman([]string{"ps", "-a", "--ns", "--format", "{{.PIDNS}}"}) check.WaitWithDefaultTimeout() Expect(check).Should(Exit(0)) outputArray = check.OutputToStringArray() - Expect(len(outputArray)).To(Equal(2)) + Expect(outputArray).To(HaveLen(2)) PID1 := outputArray[0] PID2 := outputArray[1] @@ -274,7 +274,7 @@ var _ = Describe("Podman pod create", func() { check.WaitWithDefaultTimeout() Expect(check).Should(Exit(0)) outputArray := check.OutputToStringArray() - Expect(len(outputArray)).To(Equal(2)) + Expect(outputArray).To(HaveLen(2)) PID1 := outputArray[0] PID2 := outputArray[1] @@ -299,7 +299,7 @@ var _ = Describe("Podman pod create", func() { check.WaitWithDefaultTimeout() Expect(check).Should(Exit(0)) outputArray := check.OutputToStringArray() - Expect(len(outputArray)).To(Equal(2)) + Expect(outputArray).To(HaveLen(2)) PID1 := outputArray[0] PID2 := outputArray[1] |