diff --git a/dtmcli/dtmimp/trans_base.go b/dtmcli/dtmimp/trans_base.go index 55dcdb6..879ffc2 100644 --- a/dtmcli/dtmimp/trans_base.go +++ b/dtmcli/dtmimp/trans_base.go @@ -44,8 +44,8 @@ func (g *BranchIDGen) CurrentSubBranchID() string { type TransOptions struct { WaitResult bool `json:"wait_result,omitempty" gorm:"-"` TimeoutToFail int64 `json:"timeout_to_fail,omitempty" gorm:"-"` // for trans type: xa, tcc - RequestTimeout int64 `json:"requestTimeout" gorm:"-"` // for global trans resets request timeout - RetryInterval int64 `json:"retry_interval,omitempty" gorm:"-"` // for trans type: msg saga xa tcc + RequestTimeout int64 `json:"requestTimeout" gorm:"-"` // for global trans resets request timeout + RetryInterval int64 `json:"retry_interval,omitempty" gorm:"-"` // for trans type: msg saga xa tcc PassthroughHeaders []string `json:"passthrough_headers,omitempty" gorm:"-"` BranchHeaders map[string]string `json:"branch_headers,omitempty" gorm:"-"` } diff --git a/test/busi/base_http.go b/test/busi/base_http.go index abcd8b3..28fa8cf 100644 --- a/test/busi/base_http.go +++ b/test/busi/base_http.go @@ -153,7 +153,7 @@ func BaseAddRoute(app *gin.Engine) { return SagaAdjustBalance(db, TransOutUID, reqFrom(c).Amount, reqFrom(c).TransOutResult) }) })) - app.POST(BusiAPI + "/TransOutTimeout", dtmutil.WrapHandler2(func(c *gin.Context) interface{} { + app.POST(BusiAPI+"/TransOutTimeout", dtmutil.WrapHandler2(func(c *gin.Context) interface{} { time.Sleep(time.Second * 4) return handleGeneralBusiness(c, MainSwitch.TransOutResult.Fetch(), reqFrom(c).TransOutResult, "TransOut") })) diff --git a/test/saga_options_test.go b/test/saga_options_test.go index 8e23205..879a440 100644 --- a/test/saga_options_test.go +++ b/test/saga_options_test.go @@ -61,7 +61,7 @@ func TestSagaGlobalTransWithRequestTimeout(t *testing.T) { gid := dtmimp.GetFuncName() saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gid) saga.WaitResult = true - saga.Add(busi.Busi + "/TransOutTimeout", "", nil) + saga.Add(busi.Busi+"/TransOutTimeout", "", nil) saga.WithGlobalTransRequestTimeout(6) err := saga.Submit() assert.Nil(t, err)