Skip to content

adaptertest: fix goroutine/test lifecycle race in testReleasing #195

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
andrewwormald wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −9
Open

adaptertest: fix goroutine/test lifecycle race in testReleasing #195

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
21 changes: 12 additions & 9 deletions adapters/adaptertest/rolescheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,20 @@ func testReleasing(t *testing.T, factory func(t *testing.T, instances int) []wor
ctx, cancel := context.WithCancel(context.Background())
t.Cleanup(cancel)

passed := make(chan bool)
outerErr := make(chan error, 1)
innerErr := make(chan error, 1)

go func() {
_, _, err := rs[0].Await(ctx, "leader-releasing")
require.NoError(t, err)
outerErr <- err
if err != nil {
return
}

ctx2, cancel2 := context.WithCancel(context.Background())
go func() {
_, _, err := rs[1].Await(ctx2, "leader-releasing")
require.ErrorIs(t, err, context.Canceled)

// Record that the execution got here.
passed <- true
innerErr <- err
}()

// Cancel the other caller to test that it unlocks on context cancellation
Expand All @@ -99,9 +101,10 @@ func testReleasing(t *testing.T, factory func(t *testing.T, instances int) []wor
select {
case <-timeout:
require.FailNow(t, "not all instances obtained the lock")
return
case <-passed:
// Expected call stack executed
case err := <-outerErr:
require.NoError(t, err)
case err := <-innerErr:
require.ErrorIs(t, err, context.Canceled)
return
}
}
Expand Down
Loading