From 141a155d6da7a30c0511a8b46760d2bffdc68848 Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Fri, 8 Jul 2022 18:11:39 +0800
Subject: [PATCH] startup updated

---
 test/busi/base_grpc.go     |  4 ++--
 test/busi/base_http.go     | 11 ++++++-----
 test/busi/base_workflow.go | 13 -------------
 test/busi/startup.go       |  7 +++----
 test/main_test.go          | 12 +++++++++---
 5 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 test/busi/base_workflow.go

diff --git a/test/busi/base_grpc.go b/test/busi/base_grpc.go
index 5086025..c7bd726 100644
--- a/test/busi/base_grpc.go
+++ b/test/busi/base_grpc.go
@@ -52,8 +52,8 @@ func GrpcStartup() *grpc.Server {
 	return s
 }
 
-// GrpcServe start to serve grpc
-func GrpcServe(server *grpc.Server) {
+// RunGrpc start to serve grpc
+func RunGrpc(server *grpc.Server) {
 	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", BusiGrpcPort))
 	logger.FatalIfError(err)
 	logger.Debugf("busi grpc listening at %v", lis.Addr())
diff --git a/test/busi/base_http.go b/test/busi/base_http.go
index 056947a..89c33a6 100644
--- a/test/busi/base_http.go
+++ b/test/busi/base_http.go
@@ -69,14 +69,15 @@ func BaseAppStartup() *gin.Engine {
 		logger.Debugf("initing %s", k)
 		v(app)
 	}
-	logger.Debugf("Starting busi at: %d", BusiPort)
-	go func() {
-		err := app.Run(fmt.Sprintf(":%d", BusiPort))
-		dtmimp.FatalIfError(err)
-	}()
 	return app
 }
 
+func RunHTTP(app *gin.Engine) {
+	logger.Debugf("Starting busi at: %d", BusiPort)
+	err := app.Run(fmt.Sprintf(":%d", BusiPort))
+	dtmimp.FatalIfError(err)
+}
+
 // BaseAddRoute add base route handler
 func BaseAddRoute(app *gin.Engine) {
 	app.POST(BusiAPI+"/workflow/resume", dtmutil.WrapHandler(func(ctx *gin.Context) interface{} {
diff --git a/test/busi/base_workflow.go b/test/busi/base_workflow.go
deleted file mode 100644
index e485e0c..0000000
--- a/test/busi/base_workflow.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package busi
-
-import (
-	"github.com/dtm-labs/dtm/dtmgrpc/workflow"
-	"github.com/dtm-labs/dtm/dtmutil"
-	"google.golang.org/grpc"
-)
-
-// WorkflowStarup 1
-func WorkflowStarup(server *grpc.Server) {
-	workflow.InitHTTP(dtmServer, Busi+"/workflow/resume")
-	workflow.InitGrpc(dtmutil.DefaultGrpcServer, BusiGrpc, server)
-}
diff --git a/test/busi/startup.go b/test/busi/startup.go
index a658061..9823360 100644
--- a/test/busi/startup.go
+++ b/test/busi/startup.go
@@ -2,13 +2,12 @@ package busi
 
 import (
 	"github.com/gin-gonic/gin"
+	grpc "google.golang.org/grpc"
 )
 
 // Startup startup the busi's grpc and http service
-func Startup() *gin.Engine {
+func Startup() (*gin.Engine, *grpc.Server) {
 	svr := GrpcStartup()
 	app := BaseAppStartup()
-	WorkflowStarup(svr)
-	go GrpcServe(svr)
-	return app
+	return app, svr
 }
diff --git a/test/main_test.go b/test/main_test.go
index 3e9bae5..ad2c212 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -15,9 +15,11 @@ import (
 	"github.com/dtm-labs/dtm/dtmcli/dtmimp"
 	"github.com/dtm-labs/dtm/dtmcli/logger"
 	"github.com/dtm-labs/dtm/dtmgrpc"
+	"github.com/dtm-labs/dtm/dtmgrpc/workflow"
 	"github.com/dtm-labs/dtm/dtmsvr"
 	"github.com/dtm-labs/dtm/dtmsvr/config"
 	"github.com/dtm-labs/dtm/dtmsvr/storage/registry"
+	"github.com/dtm-labs/dtm/dtmutil"
 	"github.com/dtm-labs/dtm/test/busi"
 	"github.com/go-resty/resty/v2"
 )
@@ -69,9 +71,13 @@ func TestMain(m *testing.M) {
 	go dtmsvr.StartSvr()
 
 	busi.PopulateDB(false)
-	_ = busi.Startup()
-	r := m.Run()
-	exitIf(r)
+	hsvr, gsvr := busi.Startup()
+	// WorkflowStarup 1
+	workflow.InitHTTP(dtmutil.DefaultHTTPServer, Busi+"/workflow/resume")
+	workflow.InitGrpc(dtmutil.DefaultGrpcServer, busi.BusiGrpc, gsvr)
+	go busi.RunHTTP(hsvr)
+	go busi.RunGrpc(gsvr)
+
 	close(dtmsvr.TransProcessedTestChan)
 	gid, more := <-dtmsvr.TransProcessedTestChan
 	logger.FatalfIf(more, "extra gid: %s in test chan", gid)