From 735a129a2450952863eea2da8ad9d7f8698a4a9f Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Wed, 21 Sep 2022 07:51:09 +0800 Subject: [PATCH] change monkey -> gomonkey --- go.mod | 2 +- go.sum | 2 -- test/msg_barrier_test.go | 14 +++++++------- test/msg_grpc_barrier_test.go | 14 +++++++------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 2e6b99a..0393929 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/dtm-labs/dtm go 1.16 require ( - bou.ke/monkey v1.0.2 + github.com/agiledragon/gomonkey v2.0.2+incompatible // indirect github.com/dtm-labs/dtmdriver v0.0.6 github.com/dtm-labs/dtmdriver-dapr v0.0.1 github.com/dtm-labs/dtmdriver-gozero v0.0.7 diff --git a/go.sum b/go.sum index 80b525c..5fe1771 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= -bou.ke/monkey v1.0.2 h1:kWcnsrCNUatbxncxR/ThdYqbytgOIArtYWqcQLQzKLI= -bou.ke/monkey v1.0.2/go.mod h1:OqickVX3tNx6t33n1xvtTtu85YN5s6cKwVug+oHMaIA= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= diff --git a/test/msg_barrier_test.go b/test/msg_barrier_test.go index d252788..913b815 100644 --- a/test/msg_barrier_test.go +++ b/test/msg_barrier_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "bou.ke/monkey" + "github.com/agiledragon/gomonkey" "github.com/dtm-labs/dtm/client/dtmcli" "github.com/dtm-labs/dtm/client/dtmcli/dtmimp" "github.com/dtm-labs/dtm/test/busi" @@ -88,16 +88,16 @@ func TestMsgDoAndSubmitCommitFailed(t *testing.T) { req := busi.GenReqHTTP(30, false, false) msg := dtmcli.NewMsg(DtmServer, gid). Add(busi.Busi+"/SagaBTransIn", req) - var g *monkey.PatchGuard + var g *gomonkey.Patches err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error { - g = monkey.PatchInstanceMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { + g = gomonkey.ApplyMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { logger.Debugf("tx.Commit rollback and return error in test") _ = tx.Rollback() return errors.New("test error for patch") }) return busi.SagaAdjustBalance(tx, busi.TransOutUID, -req.Amount, "SUCCESS") }) - g.Unpatch() + g.Reset() assert.Error(t, err) assertSameBalance(t, before, "mysql") } @@ -111,11 +111,11 @@ func TestMsgDoAndSubmitCommitAfterFailed(t *testing.T) { req := busi.GenReqHTTP(30, false, false) msg := dtmcli.NewMsg(DtmServer, gid). Add(busi.Busi+"/SagaBTransIn", req) - var guard *monkey.PatchGuard + var guard *gomonkey.Patches err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error { err := busi.SagaAdjustBalance(tx, busi.TransOutUID, -req.Amount, "SUCCESS") - guard = monkey.PatchInstanceMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { - guard.Unpatch() + guard = gomonkey.ApplyMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { + guard.Reset() _ = tx.Commit() return errors.New("test error for patch") }) diff --git a/test/msg_grpc_barrier_test.go b/test/msg_grpc_barrier_test.go index 2cb9b16..5f95684 100644 --- a/test/msg_grpc_barrier_test.go +++ b/test/msg_grpc_barrier_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "bou.ke/monkey" + "github.com/agiledragon/gomonkey" "github.com/dtm-labs/dtm/client/dtmcli/dtmimp" "github.com/dtm-labs/dtm/client/dtmgrpc" "github.com/dtm-labs/dtm/test/busi" @@ -39,11 +39,11 @@ func TestMsgGrpcPrepareAndSubmitCommitAfterFailed(t *testing.T) { req := busi.GenReqGrpc(30, false, false) msg := dtmgrpc.NewMsgGrpc(DtmGrpcServer, gid). Add(busi.BusiGrpc+"/busi.Busi/TransInBSaga", req) - var guard *monkey.PatchGuard + var guard *gomonkey.Patches err := msg.DoAndSubmitDB(busi.BusiGrpc+"/busi.Busi/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error { err := busi.SagaAdjustBalance(tx, busi.TransOutUID, -int(req.Amount), "SUCCESS") - guard = monkey.PatchInstanceMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { - guard.Unpatch() + guard = gomonkey.ApplyMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { + guard.Reset() _ = tx.Commit() return errors.New("test error for patch") }) @@ -63,16 +63,16 @@ func TestMsgGrpcPrepareAndSubmitCommitFailed(t *testing.T) { req := busi.GenReqGrpc(30, false, false) msg := dtmgrpc.NewMsgGrpc(DtmGrpcServer, gid). Add(busi.Busi+"/SagaBTransIn", req) - var g *monkey.PatchGuard + var g *gomonkey.Patches err := msg.DoAndSubmitDB(busi.BusiGrpc+"/busi.Busi/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error { - g = monkey.PatchInstanceMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { + g = gomonkey.ApplyMethod(reflect.TypeOf(tx), "Commit", func(tx *sql.Tx) error { logger.Debugf("tx.Commit rollback and return error in test") _ = tx.Rollback() return errors.New("test error for patch") }) return busi.SagaAdjustBalance(tx, busi.TransOutUID, -int(req.Amount), "SUCCESS") }) - g.Unpatch() + g.Reset() assert.Error(t, err) assertSameBalance(t, before, "mysql") }