Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

server/webset/test/basic.go

@@ -1,31 +1,38 @@
-package logic
+package wetset_test
 
 import (
 	"fmt"
+	homeuserauthtest "fusenapi/server/home-user-auth/test"
 	"fusenapi/server/webset/internal/config"
 	"fusenapi/server/webset/internal/handler"
 	"fusenapi/server/webset/internal/svc"
+	"fusenapi/utils/fstests"
 	"log"
+	"runtime"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
 )
 
-var testConfigFile = "../etc/wetset.yaml"
 var cnf config.Config
-var gserver *rest.Server
+var userver, gserver *rest.Server
 
 func init() {
 	log.SetFlags(log.Llongfile)
+	userver = homeuserauthtest.GetTestServer()
 	gserver = GetTestServer()
 }
 
 func GetTestServer() *rest.Server {
 
-	conf.MustLoad(testConfigFile, &cnf)
+	conf.MustLoad(fstests.GetEtcYamlPathAuto(), &cnf)
 
 	server := rest.MustNewServer(cnf.RestConf)
-	defer server.Stop()
+	runtime.SetFinalizer(server, func(server *rest.Server) {
+		if server != nil {
+			server.Stop()
+		}
+	})
 
 	ctx := svc.NewServiceContext(cnf)
 	handler.RegisterHandlers(server, ctx)

server/webset/test/wetset_test.go

@@ -1,4 +1,4 @@
-package logic
+package wetset_test
 
 import (
 	"fmt"