Skip to content

Fix registry race test compilation #2040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
27rohan wants to merge 1 commit into
base: 0.27.2
Choose a base branch
from
+19 −19
Open

Fix registry race test compilation #2040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions pkg/model/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ func Test_Registry_BasicOperations_ConcurrencyTest(t *testing.T) {
go func() {
startWg.Done()
startWg.Wait() // Block until the other goroutine has begun execution
reg.RegisterConfigMap(testCmA)
reg.RegisterPVC(testPvcA)
reg.RegisterConfigMap(&testCmA)
reg.RegisterPVC(&testPvcA)
doneWg.Done()
}()

go func() {
startWg.Done()
startWg.Wait() // Block until the other goroutine has begun execution
reg.RegisterConfigMap(testCmA)
reg.RegisterConfigMap(testCmAOtherNamespace)
reg.RegisterConfigMap(testCmB)
reg.RegisterPVC(testPvcB)
reg.RegisterConfigMap(&testCmA)
reg.RegisterConfigMap(&testCmAOtherNamespace)
reg.RegisterConfigMap(&testCmB)
reg.RegisterPVC(&testPvcB)
doneWg.Done()
}()

Expand All @@ -101,7 +101,7 @@ func Test_Registry_BasicOperations_ConcurrencyTest(t *testing.T) {
&testPvcA: PVC,
&testPvcB: PVC,
} {
if got := reg.hasEntity(expectedEntityType, *expectedMetaObj); !got {
if got := reg.hasEntity(expectedEntityType, expectedMetaObj); !got {
t.Errorf(
"Expected registry to contain entity type %s:{Namespace = %s, Name = %s}",
expectedEntityType,
Expand All @@ -117,20 +117,20 @@ func Test_Registry_BasicOperations_ConcurrencyTest(t *testing.T) {

go func() {
startWg.Done()
startWg.Wait() // Block until the other goroutine has begun execution
reg.RegisterPVC(testPvcD) // Add a net-new PVC (both goroutines)
reg.deleteEntity(ConfigMap, testCmAOtherNamespace) // Delete testCmAOtherNamespace (only this goroutine)
reg.deleteEntity(ConfigMap, testCmB) // Delete testCmB (both goroutines)
startWg.Wait() // Block until the other goroutine has begun execution
reg.RegisterPVC(&testPvcD) // Add a net-new PVC (both goroutines)
reg.deleteEntity(ConfigMap, &testCmAOtherNamespace) // Delete testCmAOtherNamespace (only this goroutine)
reg.deleteEntity(ConfigMap, &testCmB) // Delete testCmB (both goroutines)
doneWg.Done()
}()

go func() {
startWg.Done()
startWg.Wait() // Block until the other goroutine has begun execution
reg.RegisterPVC(testPvcC) // Add a net-new PVC (only this goroutine)
reg.RegisterPVC(testPvcD) // Add a net-new PVC (both goroutines)
reg.deleteEntity(ConfigMap, testCmB) // Delete testCmB (both goroutines)
reg.deleteEntity(PVC, testPvcB) // Delete testPvcB (only this goroutine)
startWg.Wait() // Block until the other goroutine has begun execution
reg.RegisterPVC(&testPvcC) // Add a net-new PVC (only this goroutine)
reg.RegisterPVC(&testPvcD) // Add a net-new PVC (both goroutines)
reg.deleteEntity(ConfigMap, &testCmB) // Delete testCmB (both goroutines)
reg.deleteEntity(PVC, &testPvcB) // Delete testPvcB (only this goroutine)
doneWg.Done()
}()

Expand All @@ -152,7 +152,7 @@ func Test_Registry_BasicOperations_ConcurrencyTest(t *testing.T) {
&testPvcC: PVC, // We added testPvcC (one of the goroutines)
&testPvcD: PVC, // We added testPvcD (both goroutines tried)
} {
if got := reg.hasEntity(expectedEntityType, *expectedMetaObj); !got {
if got := reg.hasEntity(expectedEntityType, expectedMetaObj); !got {
t.Errorf(
"Expected registry to contain entity type %s:{Namespace = %s, Name = %s}",
expectedEntityType,
Expand All @@ -171,7 +171,7 @@ func Test_Registry_BasicOperations_ConcurrencyTest(t *testing.T) {
go func() {
startWg.Done()
startWg.Wait() // Block until the other goroutine has begun execution
reg.Walk(func(entityType EntityType, meta v1.ObjectMeta) {
reg.Walk(func(entityType EntityType, meta v1.Object) {
threadAObjsSeen++
})
doneWg.Done()
Expand All @@ -181,7 +181,7 @@ func Test_Registry_BasicOperations_ConcurrencyTest(t *testing.T) {
go func() {
startWg.Done()
startWg.Wait() // Block until the other goroutine has begun execution
reg.Walk(func(entityType EntityType, meta v1.ObjectMeta) {
reg.Walk(func(entityType EntityType, meta v1.Object) {
threadBObjsSeen++
})
doneWg.Done()
Expand Down