address PR feedback

Author: dprotaso

test/common.go

@@ -29,12 +29,7 @@ import (
 func ReadyAddressCount(slices []discoveryv1.EndpointSlice) int {
 	count := 0
 	for _, slice := range slices {
-		for _, ep := range slice.Endpoints {
-			if ep.Conditions.Ready != nil && !(*ep.Conditions.Ready) {
-				continue
-			}
-			count += len(ep.Addresses)
-		}
+		count += len(ReadyAddresses(slice))
 	}
 	return count
 }
@@ -54,3 +49,15 @@ func EndpointSlicesForService(k kubernetes.Interface, namespace, name string) ([
 
 	return slices.Items, nil
 }
+
+// ReadyAddresses returns an iterator over ready endpoint addresses.
+func ReadyAddresses(slice discoveryv1.EndpointSlice) []string {
+	var res []string
+	for _, ep := range slice.Endpoints {
+		if ep.Conditions.Ready != nil && !(*ep.Conditions.Ready) {
+			continue
+		}
+		res = append(res, ep.Addresses...)
+	}
+	return res
+}

test/e2e/e2e.go

@@ -127,15 +127,11 @@ func waitForActivatorEndpoints(ctx *TestContext) error {
 		aset = make(sets.Set[string], wantAct)
 
 		for _, slice := range actEps {
-			for _, ep := range slice.Endpoints {
-				aset.Insert(ep.Addresses...)
-			}
+			aset.Insert(test.ReadyAddresses(slice)...)
 		}
 		svcSet = make(sets.Set[string], wantAct)
 		for _, slice := range svcEps {
-			for _, ep := range slice.Endpoints {
-				svcSet.Insert(ep.Addresses...)
-			}
+			svcSet.Insert(test.ReadyAddresses(slice)...)
 		}
 
 		// Subset wants this many activators, but there might not be as many,