status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(wallet) fix test on checking order of async task 

Updates status-desktop: #11404
This commit is contained in:
Stefan 2023-07-29 14:00:45 +01:00 committed by Stefan Dunca
parent 5a8f1feea9
commit afe0fcdcf4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/wallet/async/scheduler_test.go
View File

@ -81,7 +81,6 @@ func TestScheduler_Enqueue_VerifyReplacementPolicyCancelOld(t *testing.T) {
stage1FirstTaskStarted testStage = "First task started" stage1FirstTaskStarted testStage = "First task started"
stage2ThirdEnqueueOverwroteSecondTask testStage = "Third Enqueue overwrote second task" stage2ThirdEnqueueOverwroteSecondTask testStage = "Third Enqueue overwrote second task"
stage3ExitingFirstCancelledTask testStage = "Exiting first cancelled task" stage3ExitingFirstCancelledTask testStage = "Exiting first cancelled task"
stage4FirstTaskCanceledResponse testStage = "First task canceled response"
stage5ThirdTaskRunning testStage = "Third task running" stage5ThirdTaskRunning testStage = "Third task running"
stage6ThirdTaskResponse testStage = "Third task response" stage6ThirdTaskResponse testStage = "Third task response"
) )
@ -90,18 +89,19 @@ func TestScheduler_Enqueue_VerifyReplacementPolicyCancelOld(t *testing.T) {
stage1FirstTaskStarted, stage1FirstTaskStarted,
stage2ThirdEnqueueOverwroteSecondTask, stage2ThirdEnqueueOverwroteSecondTask,
stage3ExitingFirstCancelledTask, stage3ExitingFirstCancelledTask,
stage4FirstTaskCanceledResponse,
stage5ThirdTaskRunning, stage5ThirdTaskRunning,
stage6ThirdTaskResponse, stage6ThirdTaskResponse,
} }
callChan := make(chan testStage, len(testStages)) callChan := make(chan testStage, len(testStages))
resultCallCount := 0
var firstRunWG, secondRunWG, thirdRunWG sync.WaitGroup var firstRunWG, secondRunWG, thirdRunWG sync.WaitGroup
firstRunWG.Add(1) firstRunWG.Add(1)
secondRunWG.Add(1) secondRunWG.Add(1)
thirdRunWG.Add(1) thirdRunWG.Add(1)
stage4AsyncFirstTaskCanceledResponse := false
testTask := TaskType{1, ReplacementPolicyCancelOld} testTask := TaskType{1, ReplacementPolicyCancelOld}
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
currentIndex := i currentIndex := i
@ -130,7 +130,7 @@ func TestScheduler_Enqueue_VerifyReplacementPolicyCancelOld(t *testing.T) {
switch currentIndex { switch currentIndex {
case 0: case 0:
// First task was cancelled by the second one Enqueue call // First task was cancelled by the second one Enqueue call
callChan <- stage4FirstTaskCanceledResponse stage4AsyncFirstTaskCanceledResponse = true
require.ErrorAs(t, err, &context.Canceled) require.ErrorAs(t, err, &context.Canceled)
case 1: case 1:
@ -141,11 +141,6 @@ func TestScheduler_Enqueue_VerifyReplacementPolicyCancelOld(t *testing.T) {
thirdRunWG.Done() thirdRunWG.Done()
require.True(t, errors.Is(err, ErrTaskOverwritten)) require.True(t, errors.Is(err, ErrTaskOverwritten))
case 3:
// Third task was successfully executed
require.Equal(t, testTask, taskType)
require.Nil(t, res)
resultCallCount++
} }
}) })
require.False(t, ignored) require.False(t, ignored)
@ -179,6 +174,7 @@ func TestScheduler_Enqueue_VerifyReplacementPolicyCancelOld(t *testing.T) {
require.Fail(t, "test not completed in time", `last result: "%s" for cancel task policy`, lastRes) require.Fail(t, "test not completed in time", `last result: "%s" for cancel task policy`, lastRes)
} }
} }
require.True(t, stage4AsyncFirstTaskCanceledResponse)
} }
func TestScheduler_Enqueue_VerifyReplacementPolicyIgnoreNew(t *testing.T) { func TestScheduler_Enqueue_VerifyReplacementPolicyIgnoreNew(t *testing.T) {