From e01342da81ce63d9999aeb7f4d23f90d53b4e0d6 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 7 May 2021 19:21:36 +0100 Subject: [PATCH 1/2] Fix intermittent test failure in TestLevelQueue Fix #15776 Signed-off-by: Andrew Thornton --- modules/queue/queue_disk_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/queue/queue_disk_test.go b/modules/queue/queue_disk_test.go index edaed49a52396..7aafdf16ba1b1 100644 --- a/modules/queue/queue_disk_test.go +++ b/modules/queue/queue_disk_test.go @@ -70,10 +70,15 @@ func TestLevelQueue(t *testing.T) { }() result1 := <-handleChan + result2 := <-handleChan + + if result1.TestString != test1.TestString { + result1, result2 = result2, result1 + } + assert.Equal(t, test1.TestString, result1.TestString) assert.Equal(t, test1.TestInt, result1.TestInt) - result2 := <-handleChan assert.Equal(t, test2.TestString, result2.TestString) assert.Equal(t, test2.TestInt, result2.TestInt) From a2d34203e1d09572e0fb9bf68d084d898667aa61 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 7 May 2021 19:54:18 +0100 Subject: [PATCH 2/2] Remove boost from TestLeveLQueue Signed-off-by: Andrew Thornton --- modules/queue/queue_disk_test.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/queue/queue_disk_test.go b/modules/queue/queue_disk_test.go index 7aafdf16ba1b1..6e7127ab2de30 100644 --- a/modules/queue/queue_disk_test.go +++ b/modules/queue/queue_disk_test.go @@ -40,7 +40,7 @@ func TestLevelQueue(t *testing.T) { BatchLength: 2, BlockTimeout: 1 * time.Second, BoostTimeout: 5 * time.Minute, - BoostWorkers: 5, + BoostWorkers: 0, MaxWorkers: 10, }, Workers: 1, @@ -72,10 +72,6 @@ func TestLevelQueue(t *testing.T) { result1 := <-handleChan result2 := <-handleChan - if result1.TestString != test1.TestString { - result1, result2 = result2, result1 - } - assert.Equal(t, test1.TestString, result1.TestString) assert.Equal(t, test1.TestInt, result1.TestInt) @@ -118,7 +114,7 @@ func TestLevelQueue(t *testing.T) { BatchLength: 2, BlockTimeout: 1 * time.Second, BoostTimeout: 5 * time.Minute, - BoostWorkers: 5, + BoostWorkers: 0, MaxWorkers: 10, }, Workers: 1, @@ -139,10 +135,11 @@ func TestLevelQueue(t *testing.T) { }) result3 := <-handleChan + result4 := <-handleChan + assert.Equal(t, test1.TestString, result3.TestString) assert.Equal(t, test1.TestInt, result3.TestInt) - result4 := <-handleChan assert.Equal(t, test2.TestString, result4.TestString) assert.Equal(t, test2.TestInt, result4.TestInt)