Browse Source

fix assert failure

pull/330/head
yedf2 4 years ago
parent
commit
f7756be978
  1. 2
      client/dtmcli/utils.go
  2. 2
      test/tcc_test.go

2
client/dtmcli/utils.go

@ -22,7 +22,7 @@ func MustGenGid(server string) string {
// ErrorMessage2Error return an error fmt.Errorf("%s %w", errMsg, err) but trim out duplicate wrap
// eg. ErrorMessage2Error("an error. FAILURE", ErrFailure) return an error with message: "an error. FAILURE",
// no additional ". FAILURE" added
// no additional " FAILURE" added
func ErrorMessage2Error(errMsg string, err error) error {
errMsg = strings.TrimSuffix(errMsg, " "+err.Error())
return fmt.Errorf("%s %w", errMsg, err)

2
test/tcc_test.go

@ -46,7 +46,7 @@ func TestTccRollback(t *testing.T) {
cronTransOnce(t, gid)
assert.Equal(t, StatusFailed, getTransStatus(gid))
assert.Equal(t, []string{StatusSucceed, StatusPrepared, StatusSucceed, StatusPrepared}, getBranchesStatus(gid))
assert.Equal(t, "{\"error\":\"reason:. FAILURE\"}. FAILURE", getTrans(gid).RollbackReason)
assert.Contains(t, getTrans(gid).RollbackReason, dtmcli.ResultFailure)
}
func TestTccTimeout(t *testing.T) {

Loading…
Cancel
Save