Skip to content

Commit 65c9767

Browse files
committed
Fix another data race in initializersRemoved list
On-behalf-of: SAP <[email protected]> Signed-off-by: Marvin Beckers <[email protected]>
1 parent e2d858c commit 65c9767

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

test/e2e/initializingworkspaces_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,18 +230,24 @@ var _ = Describe("InitializingWorkspaces Provider", Ordered, func() {
230230
}, wait.ForeverTestTimeout, time.Millisecond*100, "failed to see workspace %q engaged as a cluster: %v", ws2.Spec.Cluster, list())
231231
})
232232

233+
listRemoved := func() []string {
234+
initializersLock.RLock()
235+
defer initializersLock.RUnlock()
236+
return initializersRemoved.List()
237+
}
238+
233239
It("removes initializers from the both clusters after engaging", func() {
234240
envtest.Eventually(GinkgoT(), func() (bool, string) {
235241
initializersLock.RLock()
236242
defer initializersLock.RUnlock()
237243
return initializersRemoved.Has(ws1.Spec.Cluster), fmt.Sprintf("failed to see removed initializer from %q cluster: %v", ws1.Spec.Cluster, initializersRemoved.List())
238-
}, wait.ForeverTestTimeout, time.Millisecond*100, "failed to see removed initializer from %q cluster: %v", ws1.Spec.Cluster, initializersRemoved.List())
244+
}, wait.ForeverTestTimeout, time.Millisecond*100, "failed to see removed initializer from %q cluster: %v", ws1.Spec.Cluster, listRemoved())
239245

240246
envtest.Eventually(GinkgoT(), func() (bool, string) {
241247
initializersLock.RLock()
242248
defer initializersLock.RUnlock()
243249
return initializersRemoved.Has(ws2.Spec.Cluster), fmt.Sprintf("failed to see removed initializer from %q cluster: %v", ws2.Spec.Cluster, initializersRemoved.List())
244-
}, wait.ForeverTestTimeout, time.Millisecond*100, "failed to see removed initializer from %q cluster: %v", ws2.Spec.Cluster, initializersRemoved.List())
250+
}, wait.ForeverTestTimeout, time.Millisecond*100, "failed to see removed initializer from %q cluster: %v", ws2.Spec.Cluster, listRemoved())
245251

246252
By("checking if LogicalClusters objects have no initializers left")
247253
var err error

0 commit comments

Comments
 (0)