guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

add e2e case for xtcp (#3451)

Browse Source
This commit is contained in:
fatedier 2023-05-28 23:06:35 +08:00 committed by GitHub
parent c71efde303
commit 756dd1ad5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/run-e2e.sh
View File

@ -17,4 +17,4 @@ if [ x${LOG_LEVEL} != x"" ]; then
logLevel=${LOG_LEVEL} logLevel=${LOG_LEVEL}
fi fi
ginkgo -nodes=8 --poll-progress-after=20s ${ROOT}/test/e2e -- -frpc-path=${ROOT}/bin/frpc -frps-path=${ROOT}/bin/frps -log-level=${logLevel} -debug=${debug} ginkgo -nodes=8 --poll-progress-after=30s ${ROOT}/test/e2e -- -frpc-path=${ROOT}/bin/frpc -frps-path=${ROOT}/bin/frps -log-level=${logLevel} -debug=${debug}

11
test/e2e/basic/basic.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"strings" "strings"
"time"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
@ -275,8 +276,8 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
}) })
}) })
ginkgo.Describe("STCP && SUDP", func() { ginkgo.Describe("STCP && SUDP && XTCP", func() {
types := []string{"stcp", "sudp"} types := []string{"stcp", "sudp", "xtcp"}
for _, t := range types { for _, t := range types {
proxyType := t proxyType := t
ginkgo.It(fmt.Sprintf("Expose echo server with %s", strings.ToUpper(proxyType)), func() { ginkgo.It(fmt.Sprintf("Expose echo server with %s", strings.ToUpper(proxyType)), func() {
@ -293,6 +294,9 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
case "sudp": case "sudp":
localPortName = framework.UDPEchoServerPort localPortName = framework.UDPEchoServerPort
protocol = "udp" protocol = "udp"
case "xtcp":
localPortName = framework.TCPEchoServerPort
protocol = "tcp"
} }
correctSK := "abc" correctSK := "abc"
@ -371,6 +375,9 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
for _, test := range tests { for _, test := range tests {
framework.NewRequestExpect(f). framework.NewRequestExpect(f).
RequestModify(func(r *request.Request) {
r.Timeout(5 * time.Second)
}).
Protocol(protocol). Protocol(protocol).
PortName(test.bindPortName). PortName(test.bindPortName).
Explain(test.proxyName). Explain(test.proxyName).