From d84ead3e00cdfff7c90dc92f9563ef4440ff84e6 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Sun, 26 Sep 2021 19:16:07 -0400
Subject: [PATCH] Fix some tests to use udp.PickPort()

(cherry picked from commit 9458a1abd3ef104576129c4be54dccc17af12a76, 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
---
 testing/scenarios/dokodemo_test.go    | 2 +-
 testing/scenarios/feature_test.go     | 2 +-
 testing/scenarios/shadowsocks_test.go | 6 +++---
 testing/scenarios/transport_test.go   | 3 ++-
 testing/scenarios/vmess_test.go       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go
index 4febc5976a0..4a1cafcc789 100644
--- a/testing/scenarios/dokodemo_test.go
+++ b/testing/scenarios/dokodemo_test.go
@@ -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{
diff --git a/testing/scenarios/feature_test.go b/testing/scenarios/feature_test.go
index e25ff8e96c9..d7a18739a08 100644
--- a/testing/scenarios/feature_test.go
+++ b/testing/scenarios/feature_test.go
@@ -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{
 			{
diff --git a/testing/scenarios/shadowsocks_test.go b/testing/scenarios/shadowsocks_test.go
index 5d6b0fc441c..acee366077c 100644
--- a/testing/scenarios/shadowsocks_test.go
+++ b/testing/scenarios/shadowsocks_test.go
@@ -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{
diff --git a/testing/scenarios/transport_test.go b/testing/scenarios/transport_test.go
index 9e31a732fef..837b2d58a62 100644
--- a/testing/scenarios/transport_test.go
+++ b/testing/scenarios/transport_test.go
@@ -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{
diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go
index dff40316383..822de9a946d 100644
--- a/testing/scenarios/vmess_test.go
+++ b/testing/scenarios/vmess_test.go
@@ -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{