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

cli: fix TestAwaitUtilCancelTx failing

cli/util/util_test.go

@@ -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)
 
-	require.Eventually(t, func() bool {
+	response := e.GetNextLine(t)
-		_, aerErr := e.Chain.GetAppExecResults(resHash.Hash(), trigger.Application)
+	if strings.Contains(response, "Conflicting transaction accepted") {
-		return aerErr == nil
+		resHash, _ := e.CheckAwaitableTxPersisted(t)
-	}, time.Second*2, time.Millisecond*50)
+		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)
+	}
 }