From 01a0d557efddf4a6de81b2d98b386b79e05d6ac6 Mon Sep 17 00:00:00 2001 From: fatedier Date: Wed, 11 Oct 2023 16:53:03 +0800 Subject: [PATCH] fix legacy ini proxy conversion panic (#3667) --- pkg/config/legacy/conversion.go | 1 + test/e2e/framework/consts/consts.go | 2 ++ test/e2e/framework/process.go | 1 + 3 files changed, 4 insertions(+) diff --git a/pkg/config/legacy/conversion.go b/pkg/config/legacy/conversion.go index 189cd73..7a55094 100644 --- a/pkg/config/legacy/conversion.go +++ b/pkg/config/legacy/conversion.go @@ -306,6 +306,7 @@ func Convert_ProxyConf_To_v1(conf ProxyConf) v1.ProxyConfigurer { c := &v1.XTCPProxyConfig{ProxyBaseConfig: *outBase} c.Secretkey = v.Sk c.AllowUsers = v.AllowUsers + out = c } return out } diff --git a/test/e2e/framework/consts/consts.go b/test/e2e/framework/consts/consts.go index 1e5ca50..4c7c2f1 100644 --- a/test/e2e/framework/consts/consts.go +++ b/test/e2e/framework/consts/consts.go @@ -25,6 +25,7 @@ log.level = "trace" DefaultClientConfig = ` serverAddr = "127.0.0.1" serverPort = {{ .%s }} +loginFailExit = false log.level = "trace" ` @@ -38,6 +39,7 @@ log.level = "trace" [common] server_addr = 127.0.0.1 server_port = {{ .%s }} + login_fail_exit = false log_level = trace ` ) diff --git a/test/e2e/framework/process.go b/test/e2e/framework/process.go index 437c899..139753e 100644 --- a/test/e2e/framework/process.go +++ b/test/e2e/framework/process.go @@ -40,6 +40,7 @@ func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []str currentServerProcesses = append(currentServerProcesses, p) err = p.Start() ExpectNoError(err) + time.Sleep(500 * time.Millisecond) } time.Sleep(1 * time.Second)