From 774c96ecee86822cf52fd30ce5968b08ee5c707e Mon Sep 17 00:00:00 2001
From: xyctruth <398041993@qq.com>
Date: Thu, 23 Jun 2022 11:29:03 +0800
Subject: [PATCH] fix some

---
 test/busi/busi.go | 5 +----
 test/saga_test.go | 2 +-
 test/types.go     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/busi/busi.go b/test/busi/busi.go
index 93e8e29..6749783 100644
--- a/test/busi/busi.go
+++ b/test/busi/busi.go
@@ -49,10 +49,7 @@ func handleGeneralBusiness(c *gin.Context, result1 string, result2 string, busi
 		return errors.New("ERROR from user")
 	}
 	if res == dtmimp.ResultFailure {
-		failureReason := MainSwitch.FailureReason.Fetch()
-		if failureReason != "" {
-			return fmt.Errorf("%s. %w", failureReason, dtmimp.ErrFailure)
-		}
+		return fmt.Errorf("reason:%s. %w", MainSwitch.FailureReason.Fetch(), dtmimp.ErrFailure)
 	}
 	return dtmcli.String2DtmError(res)
 }
diff --git a/test/saga_test.go b/test/saga_test.go
index aa8c791..f536a4c 100644
--- a/test/saga_test.go
+++ b/test/saga_test.go
@@ -33,7 +33,7 @@ func TestSagaRollback(t *testing.T) {
 	waitTransProcessed(saga.Gid)
 	assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid))
 	assert.Equal(t, StatusFailed, getTransStatus(saga.Gid))
-	assert.Equal(t, "url:http://localhost:8081/api/busi/TransIn return failed: {\"error\":\"Insufficient balance. FAILURE\"}. FAILURE", getTrans(saga.Gid).RollbackReason)
+	assert.Equal(t, "url:http://localhost:8081/api/busi/TransIn return failed: {\"error\":\"reason:Insufficient balance. FAILURE\"}. FAILURE", getTrans(saga.Gid).RollbackReason)
 }
 
 func TestSagaOngoingSucceed(t *testing.T) {
diff --git a/test/types.go b/test/types.go
index 3193f53..0f3ed43 100644
--- a/test/types.go
+++ b/test/types.go
@@ -33,7 +33,7 @@ func waitTransProcessed(gid string) {
 	case id := <-dtmsvr.TransProcessedTestChan:
 		logger.FatalfIf(id != gid, "------- expecting: %s but %s found", gid, id)
 		logger.Debugf("finish for gid %s", gid)
-	case <-time.After(time.Duration(time.Second * 10000)):
+	case <-time.After(time.Duration(time.Second * 4)):
 		logger.FatalfIf(true, "Wait Trans timeout")
 	}
 }