TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3369 from nspcc-dev/test-await

Browse source 
cli: fix TestAwaitUtilCancelTx failing
This commit is contained in:
Anna Shaleva 2024-03-22 16:33:25 +03:00 committed by GitHub
commit 900ef462df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cli/util/util_test.go
View file

@ -3,6 +3,7 @@ package util_test
import (
"os"
"path/filepath"
"strings"
"testing"
"time"
@ -169,11 +170,22 @@ func TestAwaitUtilCancelTx(t *testing.T) {
e.In.WriteString("one\r")
e.Run(t, append(args, txHash.StringLE())...)
e.CheckNextLine(t, "Conflicting transaction accepted")
resHash, _ := e.CheckAwaitableTxPersisted(t)
response := e.GetNextLine(t)
if strings.Contains(response, "Conflicting transaction accepted") {
resHash, _ := e.CheckAwaitableTxPersisted(t)
require.Eventually(t, func() bool {
_, aerErr := e.Chain.GetAppExecResults(resHash.Hash(), trigger.Application)
return aerErr == nil
}, time.Second*2, time.Millisecond*50)
} else if strings.Contains(response, "Target transaction accepted") {
require.Eventually(t, func() bool {
_, _, err := e.Chain.GetTransaction(txHash)
require.NoError(t, err, "original transaction should be on chain")
_, aerErr := e.Chain.GetAppExecResults(txHash, trigger.Application)
return aerErr == nil
}, time.Second*2, time.Millisecond*50)
} else {
t.Fatalf("unexpected response: %s", response)
}
}