diff --git a/dtmsvr/trans_class.go b/dtmsvr/trans_class.go index e9dc48c..47bf492 100644 --- a/dtmsvr/trans_class.go +++ b/dtmsvr/trans_class.go @@ -19,11 +19,12 @@ import ( "github.com/gin-gonic/gin" ) +// triggerType trigger transaction type type triggerType int const ( - triggerManual triggerType = iota //manual trigger - triggerCron //cron trigger + triggerManual triggerType = iota //triggerManual manual trigger + triggerCron //triggerCron cron trigger ) // TransGlobal global transaction diff --git a/test/msg_delay_test.go b/test/msg_delay_test.go index 32fe378..2c6165c 100644 --- a/test/msg_delay_test.go +++ b/test/msg_delay_test.go @@ -2,11 +2,9 @@ package test import ( "testing" - "time" "github.com/dtm-labs/dtm/dtmcli" "github.com/dtm-labs/dtm/dtmcli/dtmimp" - "github.com/dtm-labs/dtm/dtmsvr" "github.com/dtm-labs/dtm/dtmutil" "github.com/dtm-labs/dtm/test/busi" "github.com/stretchr/testify/assert" @@ -25,14 +23,10 @@ func TestMsgDelayNormal(t *testing.T) { gid := dtmimp.GetFuncName() msg := genMsgDelay(gid) msg.Submit() - assert.Equal(t, StatusSubmitted, getTransStatus(msg.Gid)) waitTransProcessed(msg.Gid) assert.Equal(t, []string{StatusPrepared, StatusPrepared}, getBranchesStatus(msg.Gid)) assert.Equal(t, StatusSubmitted, getTransStatus(msg.Gid)) - time.Sleep(2 * time.Second) - dtmsvr.CronForwardDuration = 0 - cronTransOnce(t, gid) + cronTransOnceForwardNow(t, gid, 2) assert.Equal(t, []string{StatusSucceed, StatusSucceed}, getBranchesStatus(msg.Gid)) assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid)) - dtmsvr.CronForwardDuration = 180 * time.Second }