From e7533462550d0c21d388e4532f4c0dcbdd24eb10 Mon Sep 17 00:00:00 2001 From: Aleksei Gurianov Date: Sun, 1 Jul 2018 19:58:34 +0400 Subject: [PATCH] increase ttl block in tests to reduce flakiness (#121) --- backend/app/rest/api/admin_test.go | 4 ++-- backend/app/store/engine/bolt_admin_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/app/rest/api/admin_test.go b/backend/app/rest/api/admin_test.go index dd10f4c7..08d36884 100644 --- a/backend/app/rest/api/admin_test.go +++ b/backend/app/rest/api/admin_test.go @@ -244,7 +244,7 @@ func TestAdmin_BlockedList(t *testing.T) { // block user2 req, err = http.NewRequest(http.MethodPut, - fmt.Sprintf("%s/api/v1/admin/user/%s?site=radio-t&block=%d&ttl=10ms", ts.URL, "user2", 1), nil) + fmt.Sprintf("%s/api/v1/admin/user/%s?site=radio-t&block=%d&ttl=50ms", ts.URL, "user2", 1), nil) assert.Nil(t, err) req.SetBasicAuth("dev", "password") _, err = client.Do(req) @@ -259,7 +259,7 @@ func TestAdmin_BlockedList(t *testing.T) { assert.Equal(t, "user1", users[0].ID) assert.Equal(t, "user2", users[1].ID) - time.Sleep(11 * time.Millisecond) + time.Sleep(50 * time.Millisecond) res, code = getWithAuth(t, ts.URL+"/api/v1/admin/blocked?site=radio-t") require.Equal(t, 200, code, res) users = []store.BlockedUser{} diff --git a/backend/app/store/engine/bolt_admin_test.go b/backend/app/store/engine/bolt_admin_test.go index 82086b1a..a46fc4a5 100644 --- a/backend/app/store/engine/bolt_admin_test.go +++ b/backend/app/store/engine/bolt_admin_test.go @@ -145,9 +145,9 @@ func TestBoltAdmin_BlockUserWithTTL(t *testing.T) { defer os.Remove(testDb) b := prep(t) assert.False(t, b.IsBlocked("radio-t", "user1"), "nothing blocked") - assert.NoError(t, b.SetBlock("radio-t", "user1", true, 10*time.Millisecond)) + assert.NoError(t, b.SetBlock("radio-t", "user1", true, 50*time.Millisecond)) assert.True(t, b.IsBlocked("radio-t", "user1"), "user1 blocked") - time.Sleep(11 * time.Millisecond) + time.Sleep(50 * time.Millisecond) assert.False(t, b.IsBlocked("radio-t", "user1"), "user1 un-blocked automatically") } @@ -156,7 +156,7 @@ func TestBoltAdmin_BlockList(t *testing.T) { b := prep(t) assert.NoError(t, b.SetBlock("radio-t", "user1", true, 0)) - assert.NoError(t, b.SetBlock("radio-t", "user2", true, 10*time.Millisecond)) + assert.NoError(t, b.SetBlock("radio-t", "user2", true, 50*time.Millisecond)) assert.NoError(t, b.SetBlock("radio-t", "user3", false, 0)) ids, err := b.Blocked("radio-t") @@ -167,7 +167,7 @@ func TestBoltAdmin_BlockList(t *testing.T) { assert.Equal(t, "user2", ids[1].ID) t.Logf("%+v", ids) - time.Sleep(11 * time.Millisecond) + time.Sleep(50 * time.Millisecond) ids, err = b.Blocked("radio-t") assert.NoError(t, err) assert.Equal(t, 1, len(ids))