Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changes/20250606090227.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:sparkles: `[parallelisation]` Added a `WaitUntil` utility
21 changes: 21 additions & 0 deletions utils/parallelisation/parallelisation.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,24 @@ func RunActionWithParallelCheck(ctx context.Context, action func(ctx context.Con
}
return err
}

// WaitUntil waits for a condition evaluated by evalCondition to be verified
func WaitUntil(ctx context.Context, evalCondition func(ctx2 context.Context) (bool, error), pauseBetweenEvaluations time.Duration) error {
cancellableCtx, cancel := context.WithCancel(ctx)
defer cancel()
for {
err := DetermineContextError(ctx)
if err != nil {
return err
}

done, err := evalCondition(cancellableCtx)
if err != nil {
return err
}
if done {
return nil
}
SleepWithContext(ctx, pauseBetweenEvaluations)
}
}
52 changes: 52 additions & 0 deletions utils/parallelisation/parallelisation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,3 +411,55 @@ func runActionWithParallelCheckFailAtRandom(t *testing.T, ctx context.Context) {
require.Error(t, err)
errortest.AssertError(t, err, commonerrors.ErrCancelled)
}

func TestWaitUntil(t *testing.T) {
verifiedCondition := func(ctx context.Context) (bool, error) {
SleepWithContext(ctx, 50*time.Millisecond)
return true, nil
}

t.Run("cancelled", func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
cancel()
err := WaitUntil(ctx, verifiedCondition, 10*time.Millisecond)
require.Error(t, err)
errortest.AssertError(t, err, commonerrors.ErrCancelled)
})
t.Run("verified", func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
err := WaitUntil(ctx, verifiedCondition, 10*time.Millisecond)
require.NoError(t, err)
})
t.Run("verified after multiple attempts", func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
counter := atomic.NewInt32(0)
verifiedConditionAfterAttempts := func(ctx context.Context) (bool, error) {
SleepWithContext(ctx, time.Millisecond)
if counter.Load() > 10 {
return true, nil
}
counter.Inc()
return false, nil
}
err := WaitUntil(ctx, verifiedConditionAfterAttempts, 10*time.Millisecond)
require.NoError(t, err)
})
t.Run("verified with condition evaluation failure", func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
counter := atomic.NewInt32(0)
verifiedConditionAfterAttempts := func(ctx context.Context) (bool, error) {
SleepWithContext(ctx, time.Millisecond)
if counter.Load() > 10 {
return false, commonerrors.ErrUnexpected
}
counter.Inc()
return false, nil
}
err := WaitUntil(ctx, verifiedConditionAfterAttempts, 10*time.Millisecond)
require.Error(t, err)
errortest.AssertError(t, err, commonerrors.ErrUnexpected)
})
}
Loading