Merge pull request #19824 from mrogers950/sa-event-flake

Add an event poll for TestOAuthServiceAccountClientEvent

Author: openshift-merge-robot

test/integration/oauth_serviceaccount_client_events_test.go

@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"golang.org/x/net/html"
 	"net/http"
 	"net/http/cookiejar"
 	"net/http/httptest"
@@ -10,6 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/html"
+
 	"github.com/RangelReale/osincli"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -151,10 +152,21 @@ func TestOAuthServiceAccountClientEvent(t *testing.T) {
 
 		runTestOAuthFlow(t, testServer, sa, secret, redirect, testCase.expectBadRequest)
 
-		// Check events
-		evList, err := testServer.clusterAdminKubeClient.Core().Events(projectName).List(metav1.ListOptions{})
+		// Check events with a short poll to stop flakes
+		var evList *kapi.EventList
+		err = wait.Poll(time.Second, 5*time.Second, func() (bool, error) {
+			evList, err = testServer.clusterAdminKubeClient.Core().Events(projectName).List(metav1.ListOptions{})
+			if err != nil {
+				return false, err
+			}
+			if len(evList.Items) < testCase.numEvents {
+				return false, nil
+			}
+			return true, nil
+		})
+
 		if err != nil {
-			t.Fatalf("%s: err listing events", tcName)
+			t.Fatalf("%s: err polling for events", tcName)
 		}
 
 		events := collectEventsWithReason(evList, testCase.expectedEventReason)