mirror of
https://github.com/fatedier/frp.git
synced 2026-03-15 14:29:16 +08:00
bcd2424c24
Replace the fixed 500ms sleep after each frps startup in RunProcesses with a TCP dial-based readiness check that polls the server bind port. This reduces the e2e suite wall time from ~97s to ~43s. Also simplify the RunProcesses API to accept a single server template string instead of a slice, matching how every call site uses it.
54 lines
1.1 KiB
Go
54 lines
1.1 KiB
Go
package basic
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/onsi/ginkgo/v2"
|
|
|
|
"github.com/fatedier/frp/test/e2e/framework"
|
|
"github.com/fatedier/frp/test/e2e/framework/consts"
|
|
"github.com/fatedier/frp/test/e2e/pkg/port"
|
|
"github.com/fatedier/frp/test/e2e/pkg/request"
|
|
)
|
|
|
|
var _ = ginkgo.Describe("[Feature: XTCP]", func() {
|
|
f := framework.NewDefaultFramework()
|
|
|
|
ginkgo.It("Fallback To STCP", func() {
|
|
serverConf := consts.DefaultServerConfig
|
|
clientConf := consts.DefaultClientConfig
|
|
|
|
bindPortName := port.GenName("XTCP")
|
|
clientConf += fmt.Sprintf(`
|
|
[[proxies]]
|
|
name = "foo"
|
|
type = "stcp"
|
|
localPort = {{ .%s }}
|
|
|
|
[[visitors]]
|
|
name = "foo-visitor"
|
|
type = "stcp"
|
|
serverName = "foo"
|
|
bindPort = -1
|
|
|
|
[[visitors]]
|
|
name = "bar-visitor"
|
|
type = "xtcp"
|
|
serverName = "bar"
|
|
bindPort = {{ .%s }}
|
|
keepTunnelOpen = true
|
|
fallbackTo = "foo-visitor"
|
|
fallbackTimeoutMs = 200
|
|
`, framework.TCPEchoServerPort, bindPortName)
|
|
|
|
f.RunProcesses(serverConf, []string{clientConf})
|
|
framework.NewRequestExpect(f).
|
|
RequestModify(func(r *request.Request) {
|
|
r.Timeout(time.Second)
|
|
}).
|
|
PortName(bindPortName).
|
|
Ensure()
|
|
})
|
|
})
|