From 58c532b9685e5ae00b852712d9c60e844a82f1ad Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 25 Mar 2020 11:05:40 +1300 Subject: [PATCH] Update name of watchEvent and comment on timeout for watch --- test/e2e/network/service.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index e86725bd191..53ea25b6b64 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -2708,14 +2708,15 @@ var _ = SIGDescribe("Services", func() { }, metav1.CreateOptions{}) framework.ExpectNoError(err, "failed to create Endpoint") - // setup a watch for the Endpoint + // set up a watch for the Endpoint + // this timeout was chosen as there was timeout failure from the CI endpointWatchTimeoutSeconds := int64(180) endpointWatch, err := f.ClientSet.CoreV1().Endpoints(ns).Watch(context.TODO(), metav1.ListOptions{LabelSelector: "testendpoint-static=true", TimeoutSeconds: &endpointWatchTimeoutSeconds}) framework.ExpectNoError(err, "failed to setup watch on newly created Endpoint") endpointWatchChan := endpointWatch.ResultChan() ginkgo.By("waiting for available Endpoint") - for event := range endpointWatchChan { - if event.Type == "ADDED" { + for watchEvent := range endpointWatchChan { + if watchEvent.Type == "ADDED" { break } } @@ -2766,7 +2767,7 @@ var _ = SIGDescribe("Services", func() { }, }, }) - framework.ExpectNoError(err, "failed to marshal JSON for Event patch") + framework.ExpectNoError(err, "failed to marshal JSON for WatchEvent patch") ginkgo.By("patching the Endpoint") _, err = f.ClientSet.CoreV1().Endpoints(ns).Patch(context.TODO(), testEndpointName, types.StrategicMergePatchType, []byte(endpointPatch), metav1.PatchOptions{}) framework.ExpectNoError(err, "failed to patch Endpoint") @@ -2787,8 +2788,8 @@ var _ = SIGDescribe("Services", func() { framework.ExpectNoError(err, "failed to delete Endpoint by Collection") ginkgo.By("waiting for Endpoint deletion") - for event := range endpointWatchChan { - if event.Type == "DELETED" { + for watchEvent := range endpointWatchChan { + if watchEvent.Type == "DELETED" { break } }