Browse Source

fix some

pull/311/head
xyctruth 4 years ago
parent
commit
774c96ecee
  1. 5
      test/busi/busi.go
  2. 2
      test/saga_test.go
  3. 2
      test/types.go

5
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)
}

2
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) {

2
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")
}
}

Loading…
Cancel
Save