fix unit test cases for ghttp/gres

.example/net/ghttp/server/session/session.go

@@ -9,7 +9,6 @@ import (
 func main() {
 	s := g.Server()
 	s.SetSessionMaxAge(60)
-	s.SetSessionIdName("gpadminssid")
 	s.BindHandler("/set", func(r *ghttp.Request) {
 		r.Session.Set("time", gtime.Second())
 		r.Response.Write("ok")

i18n/gi18n/gi18n_unit_test.go

@@ -9,6 +9,8 @@ package gi18n_test
 import (
 	"testing"
 
+	"github.com/gogf/gf/os/gres"
+
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
 
@@ -21,7 +23,7 @@ import (
 
 	"github.com/gogf/gf/test/gtest"
 
-	_ "github.com/gogf/gf/os/gres/testdata"
+	_ "github.com/gogf/gf/os/gres/testdata/data"
 )
 
 func Test_Basic(t *testing.T) {
@@ -102,9 +104,10 @@ func Test_DefaultManager(t *testing.T) {
 }
 
 func Test_Instance(t *testing.T) {
+	gres.Dump()
 	gtest.Case(t, func() {
 		m := gi18n.Instance()
-		err := m.SetPath("/i18n-dir")
+		err := m.SetPath("i18n-dir")
 		gtest.Assert(err, nil)
 		m.SetLanguage("zh-CN")
 		gtest.Assert(m.T("{#hello}{#world}"), "你好世界")
@@ -128,7 +131,7 @@ func Test_Instance(t *testing.T) {
 func Test_Resource(t *testing.T) {
 	gtest.Case(t, func() {
 		m := g.I18n("resource")
-		err := m.SetPath("/i18n-dir")
+		err := m.SetPath("i18n-dir")
 		gtest.Assert(err, nil)
 
 		m.SetLanguage("none")

net/ghttp/ghttp_server.go

@@ -195,17 +195,18 @@ func serverProcessInit() {
 // 获取/创建一个默认配置的HTTP Server(默认监听端口是80)
 // 单例模式，请保证name的唯一性
 func GetServer(name ...interface{}) *Server {
-	sname := gDEFAULT_SERVER
+	serverName := gDEFAULT_SERVER
 	if len(name) > 0 && name[0] != "" {
-		sname = gconv.String(name[0])
+		serverName = gconv.String(name[0])
 	}
-	if s := serverMapping.Get(sname); s != nil {
+	if s := serverMapping.Get(serverName); s != nil {
 		return s.(*Server)
 	}
-	sessionStorage := gkvdb.Instance(defaultServerConfig.SessionStoragePath)
-	sessionStorage.SetOptions(gkvdb.DefaultOptions(defaultServerConfig.SessionStoragePath))
+	storagePath := defaultServerConfig.SessionStoragePath + gfile.Separator + serverName
+	sessionStorage := gkvdb.Instance(storagePath)
+	sessionStorage.SetOptions(gkvdb.DefaultOptions(storagePath))
 	s := &Server{
-		name:             sname,
+		name:             serverName,
 		servers:          make([]*gracefulServer, 0),
 		closeChan:        make(chan struct{}, 100),
 		serverCount:      gtype.NewInt(),
@@ -221,7 +222,7 @@ func GetServer(name ...interface{}) *Server {
 	// 初始化时使用默认配置
 	s.SetConfig(defaultServerConfig)
 	// 记录到全局ServerMap中
-	serverMapping.Set(sname, s)
+	serverMapping.Set(serverName, s)
 	return s
 }
 

os/gres/gres_unit_1_test.go

@@ -30,8 +30,8 @@ func Test_Pack(t *testing.T) {
 func Test_PackMulti(t *testing.T) {
 	gtest.Case(t, func() {
 		srcPath := gdebug.CallerDirectory() + "/testdata/files"
-		goFilePath := gdebug.CallerDirectory() + "/testdata/testdata.go"
-		pkgName := "testdata"
+		goFilePath := gdebug.CallerDirectory() + "/testdata/data/data.go"
+		pkgName := "data"
 		array, err := gfile.ScanDir(srcPath, "*", false)
 		gtest.Assert(err, nil)
 		err = gres.PackToGoFile(strings.Join(array, ","), goFilePath, pkgName)

os/gres/gres_unit_2_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gogf/gf/test/gtest"
 
 	"github.com/gogf/gf/os/gres"
-	_ "github.com/gogf/gf/os/gres/testdata"
+	_ "github.com/gogf/gf/os/gres/testdata/data"
 )
 
 func Test_Basic(t *testing.T) {