more ci

tests/ci/cmd_test.go

@@ -0,0 +1 @@
+package ci

tests/ci/normal_test.go

@@ -1,4 +1,4 @@
-package tests
+package ci
 
 import (
 	"fmt"
@@ -42,17 +42,17 @@ func init() {
 }
 
 func runFrps() error {
-	p := util.NewProcess(consts.FRPS_BIN_PATH, []string{"-c", "./config/auto_test_frps.ini"})
+	p := util.NewProcess(consts.FRPS_BIN_PATH, []string{"-c", "./auto_test_frps.ini"})
 	return p.Start()
 }
 
 func runFrpc() error {
-	p := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", "./config/auto_test_frpc.ini"})
+	p := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", "./auto_test_frpc.ini"})
 	return p.Start()
 }
 
 func runFrpcVisitor() error {
-	p := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", "./config/auto_test_frpc_visitor.ini"})
+	p := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", "./auto_test_frpc_visitor.ini"})
 	return p.Start()
 }
 

tests/ci/reconnect_test.go

@@ -0,0 +1 @@
+package ci

tests/ci/reload_test.go

@@ -0,0 +1,108 @@
+package ci
+
+import (
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/fatedier/frp/tests/config"
+	"github.com/fatedier/frp/tests/consts"
+	"github.com/fatedier/frp/tests/util"
+)
+
+const FRPS_CONF = `
+[common]
+server_addr = 127.0.0.1
+server_port = 10700
+log_file = console
+# debug, info, warn, error
+log_level = debug
+token = 123456
+admin_port = 10600
+admin_user = abc
+admin_pwd = abc
+`
+
+const FRPC_CONF_1 = `
+[common]
+server_addr = 127.0.0.1
+server_port = 20000
+log_file = console
+# debug, info, warn, error
+log_level = debug
+token = 123456
+admin_port = 21000
+admin_user = abc
+admin_pwd = abc
+
+[tcp]
+type = tcp
+local_port = 10701
+remote_port = 20801
+
+# change remote port
+[tcp2]
+type = tcp
+local_port = 10701
+remote_port = 20802
+
+# delete
+[tcp3]
+type = tcp
+local_port = 10701
+remote_port = 20803
+`
+
+const FRPC_CONF_2 = `
+[common]
+server_addr = 127.0.0.1
+server_port = 20000
+log_file = console
+# debug, info, warn, error
+log_level = debug
+token = 123456
+admin_port = 21000
+admin_user = abc
+admin_pwd = abc
+
+[tcp]
+type = tcp
+local_port = 10701
+remote_port = 20801
+
+[tcp2]
+type = tcp
+local_port = 10701
+remote_port = 20902
+`
+
+func TestReload(t *testing.T) {
+	assert := assert.New(t)
+	frpsCfgPath, err := config.GenerateConfigFile("./auto_test_frps.ini", FRPS_CONF)
+	if assert.NoError(err) {
+		defer os.Remove(frpsCfgPath)
+	}
+
+	frpcCfgPath, err := config.GenerateConfigFile("./auto_test_frpc.ini", FRPC_CONF_1)
+	if assert.NoError(err) {
+		defer os.Remove(frpcCfgPath)
+	}
+
+	frpsProcess := util.NewProcess(consts.FRPS_BIN_PATH, []string{"-c", frpsCfgPath})
+	err = frpsProcess.Start()
+	if assert.NoError(err) {
+		defer frpsProcess.Stop()
+	}
+
+	time.Sleep(200 * time.Millisecond)
+
+	frpcProcess := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", frpcCfgPath})
+	err = frpcProcess.Start()
+	if assert.NoError(err) {
+		defer frpcProcess.Stop()
+	}
+
+	// TODO
+}

tests/config/config.go

@@ -1,9 +1,13 @@
-package util
+package config
 
 import (
 	"io/ioutil"
+	"os"
+	"path/filepath"
 )
 
-func GenerateConfigFile(path string, content string) error {
+func GenerateConfigFile(path string, content string) (realPath string, err error) {
-	return ioutil.WriteFile(path, []byte(content), 0666)
+	realPath = filepath.Join(os.TempDir(), path)
+	err = ioutil.WriteFile(realPath, []byte(content), 0666)
+	return realPath, err
 }

tests/consts/consts.go

@@ -3,8 +3,8 @@ package consts
 import "path/filepath"
 
 var (
-	FRPS_BIN_PATH = "../bin/frps"
+	FRPS_BIN_PATH = "../../bin/frps"
-	FRPC_BIN_PATH = "../bin/frpc"
+	FRPC_BIN_PATH = "../../bin/frpc"
 
 	SERVER_ADDR = "127.0.0.1"
 	ADMIN_ADDR  = "127.0.0.1:10600"