From f7756be9788eef1fb03a2af83a250a8251a2de6f Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Thu, 14 Jul 2022 11:21:04 +0800 Subject: [PATCH] fix assert failure --- client/dtmcli/utils.go | 2 +- test/tcc_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/dtmcli/utils.go b/client/dtmcli/utils.go index daa38be..983edd7 100644 --- a/client/dtmcli/utils.go +++ b/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) diff --git a/test/tcc_test.go b/test/tcc_test.go index c52c764..19b9d6d 100644 --- a/test/tcc_test.go +++ b/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) {