test msg reviewed

test/msg_grpc_test.go

@@ -17,23 +17,26 @@ func TestMsgGrpcNormal(t *testing.T) {
 	assert.Nil(t, err)
 	waitTransProcessed(msg.Gid)
 	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
+	assert.Equal(t, []string{StatusSucceed, StatusSucceed}, getBranchesStatus(msg.Gid))
 }
 
-func TestMsgGrpcOngoingSuccess(t *testing.T) {
+func TestMsgGrpcTimeoutSuccess(t *testing.T) {
 	msg := genGrpcMsg(dtmimp.GetFuncName())
 	err := msg.Prepare("")
 	assert.Nil(t, err)
 	examples.MainSwitch.CanSubmitResult.SetOnce(dtmcli.ResultOngoing)
 	cronTransOnceForwardNow(180)
 	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
-	examples.MainSwitch.TransInResult.SetOnce(dtmcli.ResultOngoing)
+	examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing)
 	cronTransOnceForwardNow(180)
 	assert.Equal(t, StatusSubmitted, getTransStatus(msg.Gid))
+	assert.Equal(t, []string{StatusPrepared, StatusPrepared}, getBranchesStatus(msg.Gid))
 	cronTransOnce()
 	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
+	assert.Equal(t, []string{StatusSucceed, StatusSucceed}, getBranchesStatus(msg.Gid))
 }
 
-func TestMsgGrpcOngoingFailed(t *testing.T) {
+func TestMsgGrpcTimeoutFailed(t *testing.T) {
 	msg := genGrpcMsg(dtmimp.GetFuncName())
 	msg.Prepare("")
 	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
@@ -42,8 +45,8 @@ func TestMsgGrpcOngoingFailed(t *testing.T) {
 	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
 	examples.MainSwitch.CanSubmitResult.SetOnce(dtmcli.ResultFailure)
 	cronTransOnceForwardNow(180)
-	assert.Equal(t, []string{StatusPrepared, StatusPrepared}, getBranchesStatus(msg.Gid))
 	assert.Equal(t, StatusFailed, getTransStatus(msg.Gid))
+	assert.Equal(t, []string{StatusPrepared, StatusPrepared}, getBranchesStatus(msg.Gid))
 }
 
 func genGrpcMsg(gid string) *dtmgrpc.MsgGrpc {

test/msg_options_test.go

@@ -0,0 +1,44 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/yedf/dtm/dtmcli"
+	"github.com/yedf/dtm/dtmcli/dtmimp"
+	"github.com/yedf/dtm/examples"
+)
+
+func TestMsgOptionsTimeout(t *testing.T) {
+	msg := genMsg(dtmimp.GetFuncName())
+	msg.Prepare("")
+	cronTransOnce()
+	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
+	cronTransOnceForwardNow(60)
+	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
+}
+
+func TestMsgOptionsTimeoutCustom(t *testing.T) {
+	msg := genMsg(dtmimp.GetFuncName())
+	msg.TimeoutToFail = 120
+	msg.Prepare("")
+	cronTransOnce()
+	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
+	cronTransOnceForwardNow(60)
+	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
+	cronTransOnceForwardNow(180)
+	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
+}
+
+func TestMsgOptionsTimeoutFailed(t *testing.T) {
+	msg := genMsg(dtmimp.GetFuncName())
+	msg.TimeoutToFail = 120
+	msg.Prepare("")
+	cronTransOnce()
+	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
+	cronTransOnceForwardNow(60)
+	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
+	examples.MainSwitch.CanSubmitResult.SetOnce(dtmcli.ResultFailure)
+	cronTransOnceForwardNow(180)
+	assert.Equal(t, StatusFailed, getTransStatus(msg.Gid))
+}

test/msg_test.go

@@ -18,7 +18,7 @@ func TestMsgNormal(t *testing.T) {
 	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
 }
 
-func TestMsgOngoingSuccess(t *testing.T) {
+func TestMsgTimeoutSuccess(t *testing.T) {
 	msg := genMsg(dtmimp.GetFuncName())
 	msg.Prepare("")
 	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))
@@ -33,7 +33,7 @@ func TestMsgOngoingSuccess(t *testing.T) {
 	assert.Equal(t, StatusSucceed, getTransStatus(msg.Gid))
 }
 
-func TestMsgOngoingFailed(t *testing.T) {
+func TestMsgTimeoutFailed(t *testing.T) {
 	msg := genMsg(dtmimp.GetFuncName())
 	msg.Prepare("")
 	assert.Equal(t, StatusPrepared, getTransStatus(msg.Gid))