public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Fix flaky serverlock integration test (#42633) (#42639)

Browse Source 
(cherry picked from commit 54fa7b57fe)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2021-12-02 13:08:06 +01:00
committed by GitHub
co-authored by Marcus Efraimsson
parent caea2a4f2d
commit 3e7d7f55c6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/serverlock/serverlock_integration_test.go
+10 -9
View File
@@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestServerLok(t *testing.T) {
@@ -16,21 +16,22 @@ func TestServerLok(t *testing.T) {
counter := 0
fn := func(context.Context) { counter++ }
atInterval := time.Second * 1
atInterval := time.Hour
ctx := context.Background()
//this time `fn` should be executed
assert.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
require.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
require.Equal(t, 1, counter)
//this should not execute `fn`
assert.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
assert.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
require.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
require.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
require.Equal(t, 1, counter)
// wait 2 second.
<-time.After(time.Second * 2)
atInterval = time.Millisecond
// now `fn` should be executed again
err := sl.LockAndExecute(ctx, "test-operation", atInterval, fn)
assert.Nil(t, err)
assert.Equal(t, counter, 2)
require.Nil(t, err)
require.Equal(t, 2, counter)
}