提交 4ab0d270 authored 作者: mooncake9527's avatar mooncake9527

update

上级 20d6f1e2
...@@ -8,6 +8,7 @@ import ( ...@@ -8,6 +8,7 @@ import (
"github.com/spf13/cast" "github.com/spf13/cast"
"github.com/spf13/viper" "github.com/spf13/viper"
"gitlab.wanzhuangkj.com/tush/xpkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
) )
var ( var (
...@@ -26,7 +27,7 @@ func init() { ...@@ -26,7 +27,7 @@ func init() {
} }
func parse() (err error) { func parse() (err error) {
if v, ok := os.LookupEnv("RUN_API_TEST"); ok && v == "a123" { if confType, ok := os.LookupEnv("CONF_TYPE"); (ok && sliceUtils.NotContains([]string{"local", "nacos", "consul"}, confType)) || !ok {
return return
} }
if hostname := os.Getenv("HOSTNAME"); hostname != "" { if hostname := os.Getenv("HOSTNAME"); hostname != "" {
......
...@@ -3,6 +3,7 @@ package xcommon ...@@ -3,6 +3,7 @@ package xcommon
import ( import (
"context" "context"
"net/http" "net/http"
"os"
"testing" "testing"
"time" "time"
...@@ -60,9 +61,16 @@ type ControllerTester struct { ...@@ -60,9 +61,16 @@ type ControllerTester struct {
} }
func NewControllerTester(host string, header map[string]string) *ControllerTester { func NewControllerTester(host string, header map[string]string) *ControllerTester {
var apiAddr = "localhost:8080"
if v, ok := os.LookupEnv("TEST_API_ADDR"); ok && v != "" {
apiAddr = v
}
if host != "" {
apiAddr = host
}
c := ControllerTester{ c := ControllerTester{
Headers: header, Headers: header,
Addr: host, Addr: apiAddr,
client: httpcli.NewClient(&http.Client{ client: httpcli.NewClient(&http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
MaxIdleConns: 100, MaxIdleConns: 100,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论