Skip to content

Commit 92d2220

Browse files
authored
fix race detection in tests (#3901)
Fixes failing unit tests due to data race warnings.
1 parent 54135b5 commit 92d2220

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

internal/controller/state/graph/backend_refs_test.go

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,9 +1664,6 @@ func TestFindBackendTLSPolicyForService(t *testing.T) {
16641664
},
16651665
}
16661666
}
1667-
oldestBtp := getBtp("oldest", oldCreationTimestamp)
1668-
newestBtp := getBtp("newest", newCreationTimestamp)
1669-
alphaFirstBtp := getBtp("alphabeticallyfirst", oldCreationTimestamp)
16701667

16711668
ref := gatewayv1.HTTPBackendRef{
16721669
BackendRef: gatewayv1.BackendRef{
@@ -1678,26 +1675,39 @@ func TestFindBackendTLSPolicyForService(t *testing.T) {
16781675
},
16791676
}
16801677

1678+
getBTPMap := func(nameAndTimestamp map[string]metav1.Time) map[types.NamespacedName]*BackendTLSPolicy {
1679+
m := make(map[types.NamespacedName]*BackendTLSPolicy, len(nameAndTimestamp))
1680+
for n, ts := range nameAndTimestamp {
1681+
btp := getBtp(n, ts)
1682+
m[client.ObjectKeyFromObject(btp.Source)] = btp
1683+
}
1684+
return m
1685+
}
1686+
16811687
tests := []struct {
16821688
name string
16831689
backendTLSPolicies map[types.NamespacedName]*BackendTLSPolicy
16841690
expectedBtpName string
16851691
}{
16861692
{
16871693
name: "oldest wins",
1688-
backendTLSPolicies: map[types.NamespacedName]*BackendTLSPolicy{
1689-
client.ObjectKeyFromObject(newestBtp.Source): newestBtp,
1690-
client.ObjectKeyFromObject(oldestBtp.Source): oldestBtp,
1691-
},
1694+
backendTLSPolicies: getBTPMap(
1695+
map[string]metav1.Time{
1696+
"newest": newCreationTimestamp,
1697+
"oldest": oldCreationTimestamp,
1698+
},
1699+
),
16921700
expectedBtpName: "oldest",
16931701
},
16941702
{
16951703
name: "alphabetically first wins",
1696-
backendTLSPolicies: map[types.NamespacedName]*BackendTLSPolicy{
1697-
client.ObjectKeyFromObject(oldestBtp.Source): oldestBtp,
1698-
client.ObjectKeyFromObject(alphaFirstBtp.Source): alphaFirstBtp,
1699-
client.ObjectKeyFromObject(newestBtp.Source): newestBtp,
1700-
},
1704+
backendTLSPolicies: getBTPMap(
1705+
map[string]metav1.Time{
1706+
"alphabeticallyfirst": oldCreationTimestamp,
1707+
"newest": newCreationTimestamp,
1708+
"oldest": oldCreationTimestamp,
1709+
},
1710+
),
17011711
expectedBtpName: "alphabeticallyfirst",
17021712
},
17031713
}

0 commit comments

Comments
 (0)