test(endpoints): deflake TestWatchHTTPTimeout

Signed-off-by: knight42 <anonymousknight96@gmail.com> Kubernetes-commit: 50e8287e6df67428ab5871af530fb10f6eee19de
2020-08-12 01:58:07 +08:00 · 2020-08-12 01:58:07 +08:00 · 5c23eb937e
parent fe7e3b0680
commit 5c23eb937e
1 changed files with 10 additions and 1 deletions
--- a/pkg/endpoints/watch_test.go
+++ b/pkg/endpoints/watch_test.go
@ -844,7 +844,16 @@ func TestWatchHTTPTimeout(t *testing.T) {
 	close(timeoutCh)
 	select {
 	case <-done:
-		if !watcher.IsStopped() {
+		eventCh := watcher.ResultChan()
+		select {
+		case _, opened := <-eventCh:
+			if opened {
+				t.Errorf("Watcher received unexpected event")
+			}
+			if !watcher.IsStopped() {
+				t.Errorf("Watcher is not stopped")
+			}
+		case <-time.After(wait.ForeverTestTimeout):
 			t.Errorf("Leaked watch on timeout")
 		}
 	case <-time.After(wait.ForeverTestTimeout):