lzhr
/
v2fly
mirror of https://github.com/v2fly/v2ray-core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some tests to use udp.PickPort() 

(cherry picked from commit 9458a1abd3, modified by committer)

In the previous version of the test code, when attempting to listen for a UDP socket, the port availability check check for TCP port instead of UDP port. This make it possible to select a UDP port that is unavailable.

See Also: https://github.com/v2fly/v2ray-core/pull/1302
This commit is contained in:
yuhan6665 2021-09-26 19:16:07 -04:00 committed by Shelikhoo
parent 52d414fa49
commit d84ead3e00
No known key found for this signature in database
GPG Key ID: AA7BC347968E7DB1
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/scenarios/dokodemo_test.go
View File

@ -157,7 +157,7 @@ func TestDokodemoUDP(t *testing.T) {
},
}
clientPort := uint32(tcp.PickPort())
clientPort := uint32(udp.PickPort())
clientPortRange := uint32(5)
clientConfig := &core.Config{
Inbound: []*core.InboundHandlerConfig{

2
testing/scenarios/feature_test.go
View File

@ -513,7 +513,7 @@ func TestUDPConnection(t *testing.T) {
common.Must(err)
defer udpServer.Close()
clientPort := tcp.PickPort()
clientPort := udp.PickPort()
clientConfig := &core.Config{
Inbound: []*core.InboundHandlerConfig{
{

6
testing/scenarios/shadowsocks_test.go
View File

@ -216,7 +216,7 @@ func TestShadowsocksAES128GCMUDP(t *testing.T) {
CipherType: shadowsocks.CipherType_AES_128_GCM,
})
serverPort := tcp.PickPort()
serverPort := udp.PickPort()
serverConfig := &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&log.Config{
@ -246,7 +246,7 @@ func TestShadowsocksAES128GCMUDP(t *testing.T) {
},
}
clientPort := tcp.PickPort()
clientPort := udp.PickPort()
clientConfig := &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&log.Config{
@ -342,7 +342,7 @@ func TestShadowsocksAES128GCMUDPMux(t *testing.T) {
},
}
clientPort := tcp.PickPort()
clientPort := udp.PickPort()
clientConfig := &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&log.Config{

3
testing/scenarios/transport_test.go
View File

@ -24,6 +24,7 @@ import (
"github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound"
"github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound"
"github.com/v2fly/v2ray-core/v4/testing/servers/tcp"
"github.com/v2fly/v2ray-core/v4/testing/servers/udp"
"github.com/v2fly/v2ray-core/v4/transport/internet"
"github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket"
"github.com/v2fly/v2ray-core/v4/transport/internet/headers/http"
@ -258,7 +259,7 @@ func TestVMessQuic(t *testing.T) {
defer tcpServer.Close()
userID := protocol.NewID(uuid.New())
serverPort := tcp.PickPort()
serverPort := udp.PickPort()
serverConfig := &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&log.Config{

2
testing/scenarios/vmess_test.go
View File

@ -404,7 +404,7 @@ func TestVMessGCMUDP(t *testing.T) {
},
}
clientPort := tcp.PickPort()
clientPort := udp.PickPort()
clientConfig := &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&log.Config{