fix registry grpc unit test intermittent failure

Signed-off-by: akihikokuroda <[email protected]>

Author: akihikokuroda

pkg/controller/registry/grpc/source_test.go

@@ -51,8 +51,8 @@ type FakeSourceSyncer struct {
 	History map[registry.CatalogKey][]connectivity.State
 
 	sync.Mutex
-	expectedEvents int
-	done           chan struct{}
+	expectedReadies int
+	done            chan struct{}
 }
 
 func (f *FakeSourceSyncer) sync(state SourceState) {
@@ -61,18 +61,20 @@ func (f *FakeSourceSyncer) sync(state SourceState) {
 		f.History[state.Key] = []connectivity.State{}
 	}
 	f.History[state.Key] = append(f.History[state.Key], state.State)
-	f.expectedEvents -= 1
-	if f.expectedEvents == 0 {
+	if state.State == connectivity.Ready {
+		f.expectedReadies -= 1
+	}
+	if f.expectedReadies == 0 {
 		f.done <- struct{}{}
 	}
 	f.Unlock()
 }
 
-func NewFakeSourceSyncer(expectedEvents int) *FakeSourceSyncer {
+func NewFakeSourceSyncer(expectedReadies int) *FakeSourceSyncer {
 	return &FakeSourceSyncer{
-		History:        map[registry.CatalogKey][]connectivity.State{},
-		expectedEvents: expectedEvents,
-		done:           make(chan struct{}),
+		History:         map[registry.CatalogKey][]connectivity.State{},
+		expectedReadies: expectedReadies,
+		done:            make(chan struct{}),
 	}
 }
 
@@ -85,21 +87,19 @@ func TestConnectionEvents(t *testing.T) {
 	test := func(tt testcase) func(t *testing.T) {
 		return func(t *testing.T) {
 			// start server for each catalog
-			totalEvents := 0
 			addresses := map[registry.CatalogKey]string{}
 
-			for catalog, events := range tt.expectedHistory {
-				totalEvents += len(events)
+			for catalog, _ := range tt.expectedHistory {
 				serve, address, stop := server(&fakes.FakeQuery{})
 				addresses[catalog] = address
 				go serve()
 				defer stop()
 			}
 
 			// start source manager
-			syncer := NewFakeSourceSyncer(totalEvents)
+			syncer := NewFakeSourceSyncer(len(tt.expectedHistory))
 			sources := NewSourceStore(logrus.New(), 1*time.Second, 5*time.Second, syncer.sync)
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 			defer cancel()
 			sources.Start(ctx)
 
@@ -116,7 +116,13 @@ func TestConnectionEvents(t *testing.T) {
 			for catalog, events := range tt.expectedHistory {
 				recordedEvents := syncer.History[catalog]
 				for i := 0; i < len(recordedEvents); i++ {
-					require.Equal(t, (events[i]).String(), (recordedEvents[i]).String())
+					found := false
+					for _, event := range events {
+						if event.String() == recordedEvents[i].String() {
+							found = true
+						}
+					}
+					require.True(t, found)
 				}
 			}
 		}