From fdc03dd2f8dc68dd1911a53f50170d3548b08c28 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 13 Dec 2022 18:20:35 +0100 Subject: [PATCH] e2e kubectl: improve Gomega check gomega.Succeed is the recommend way of checking for an error. gomega.BeNil prints a less useful failure message. --- test/e2e/kubectl/portforward.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/kubectl/portforward.go b/test/e2e/kubectl/portforward.go index e6510df361b..7947f5048f0 100644 --- a/test/e2e/kubectl/portforward.go +++ b/test/e2e/kubectl/portforward.go @@ -398,7 +398,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { return fmt.Errorf("received the wrong port: %d", p) } return nil - }, time.Minute, 10*time.Second).Should(gomega.BeNil()) + }, time.Minute, 10*time.Second).Should(gomega.Succeed()) gomega.Eventually(func() error { channel, msg, err := wsRead(ws) @@ -412,7 +412,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { return fmt.Errorf("received the wrong port: %d", p) } return nil - }, time.Minute, 10*time.Second).Should(gomega.BeNil()) + }, time.Minute, 10*time.Second).Should(gomega.Succeed()) ginkgo.By("Sending the expected data to the local port") err = wsWrite(ws, 0, []byte("def")) @@ -436,7 +436,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { return fmt.Errorf("expected %q from server, got %q", expectedData, buf.Bytes()) } return nil - }, time.Minute, 10*time.Second).Should(gomega.BeNil()) + }, time.Minute, 10*time.Second).Should(gomega.Succeed()) ginkgo.By("Verifying logs") gomega.Eventually(func() (string, error) {