cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tests to support rewrite

Browse Source
This commit is contained in:
Guy Lewin 2020-02-17 11:22:36 +02:00
parent 5c3b438863
commit a36bad8bcf
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/ci/auto_test_frpc.ini
View File

@ -126,13 +126,11 @@ custom_domains = test6.frp.com
host_header_rewrite = test6.frp.com host_header_rewrite = test6.frp.com
header_X-From-Where = frp header_X-From-Where = frp
[tcpmultiplexing] [tcphttptunnel1]
type = tcp type = tcphttptunnel
# Unused
remote_port = 0
local_ip = 127.0.0.1 local_ip = 127.0.0.1
local_port = 10701 local_port = 10701
custom_domains = tcpmulti1 custom_domains = tunnel1
[wildcard_http] [wildcard_http]
type = http type = http

2
tests/ci/auto_test_frps.ini
View File

@ -2,7 +2,7 @@
bind_addr = 0.0.0.0 bind_addr = 0.0.0.0
bind_port = 10700 bind_port = 10700
vhost_http_port = 10804 vhost_http_port = 10804
vhost_tcp_port = 10806 tcp_http_tunnel_port = 10806
log_level = trace log_level = trace
token = 123456 token = 123456
allow_ports = 10000-20000,20002,30000-50000 allow_ports = 10000-20000,20002,30000-50000

4
tests/ci/normal_test.go
View File

@ -212,10 +212,10 @@ func TestHttp(t *testing.T) {
} }
} }
func TestTcpMultiplexing(t *testing.T) { func TestTcpHttpTunnel(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
conn, err := gnet.DialTcpByProxy(fmt.Sprintf("http://%s:%d", "127.0.0.1", consts.TEST_TCP_VHOST_FRP_PORT), "tcpmulti1") conn, err := gnet.DialTcpByProxy(fmt.Sprintf("http://%s:%d", "127.0.0.1", consts.TEST_TCP_HTTP_TUNNEL_FRP_PORT), "tunnel1")
if assert.NoError(err) { if assert.NoError(err) {
res, err := util.SendTcpMsgByConn(conn, consts.TEST_TCP_ECHO_STR) res, err := util.SendTcpMsgByConn(conn, consts.TEST_TCP_ECHO_STR)
assert.NoError(err) assert.NoError(err)

2
tests/consts/consts.go
View File

@ -40,7 +40,7 @@ var (
TEST_HTTP_FOO_STR string = "http foo string: " + TEST_STR TEST_HTTP_FOO_STR string = "http foo string: " + TEST_STR
TEST_HTTP_BAR_STR string = "http bar string: " + TEST_STR TEST_HTTP_BAR_STR string = "http bar string: " + TEST_STR
TEST_TCP_VHOST_FRP_PORT int = 10806 TEST_TCP_HTTP_TUNNEL_FRP_PORT int = 10806
TEST_STCP_FRP_PORT int = 10805 TEST_STCP_FRP_PORT int = 10805
TEST_STCP_EC_FRP_PORT int = 10905 TEST_STCP_EC_FRP_PORT int = 10905