From 84bb0f13a5bd6813f5799e329d5addfe9db5f63b Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Tue, 8 Jan 2019 23:43:24 +0100
Subject: [PATCH] update reverse test

---
 testing/scenarios/reverse_test.go | 55 ++-----------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/testing/scenarios/reverse_test.go b/testing/scenarios/reverse_test.go
index 62d05dc6..1de02c24 100644
--- a/testing/scenarios/reverse_test.go
+++ b/testing/scenarios/reverse_test.go
@@ -1,13 +1,11 @@
 package scenarios
 
 import (
-	"crypto/rand"
 	"testing"
 	"time"
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/google/go-cmp/cmp"
 	"v2ray.com/core"
 	"v2ray.com/core/app/log"
 	"v2ray.com/core/app/policy"
@@ -15,7 +13,6 @@ import (
 	"v2ray.com/core/app/reverse"
 	"v2ray.com/core/app/router"
 	"v2ray.com/core/common"
-	"v2ray.com/core/common/errors"
 	clog "v2ray.com/core/common/log"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/protocol"
@@ -193,34 +190,7 @@ func TestReverseProxy(t *testing.T) {
 
 	var errg errgroup.Group
 	for i := 0; i < 32; i++ {
-		errg.Go(func() error {
-			conn, err := net.DialTCP("tcp", nil, &net.TCPAddr{
-				IP:   []byte{127, 0, 0, 1},
-				Port: int(externalPort),
-			})
-			if err != nil {
-				return err
-			}
-			defer conn.Close()
-
-			payload := make([]byte, 10240*1024)
-			rand.Read(payload)
-
-			nBytes, err := conn.Write([]byte(payload))
-			if err != nil {
-				return err
-			}
-
-			if nBytes != len(payload) {
-				return errors.New("only part of payload is written: ", nBytes)
-			}
-
-			response := readFrom(conn, time.Second*20, 10240*1024)
-			if r := cmp.Diff(response, xor(payload)); r != "" {
-				return errors.New(r)
-			}
-			return nil
-		})
+		errg.Go(testTCPConn(externalPort, 10240*1024, time.Second*20))
 	}
 
 	if err := errg.Wait(); err != nil {
@@ -418,27 +388,8 @@ func TestReverseProxyLongRunning(t *testing.T) {
 	defer CloseAllServers(servers)
 
 	for i := 0; i < 4096; i++ {
-		conn, err := net.DialTCP("tcp", nil, &net.TCPAddr{
-			IP:   []byte{127, 0, 0, 1},
-			Port: int(externalPort),
-		})
-		common.Must(err)
-
-		payload := make([]byte, 1024)
-		rand.Read(payload)
-
-		nBytes, err := conn.Write([]byte(payload))
-		common.Must(err)
-
-		if nBytes != len(payload) {
-			t.Error("only part of payload is written: ", nBytes)
+		if err := testTCPConn(externalPort, 1024, time.Second*10)(); err != nil {
+			t.Error(err)
 		}
-
-		response := readFrom(conn, time.Second*5, 1024)
-		if r := cmp.Diff(response, xor(payload)); r != "" {
-			t.Error(r)
-		}
-
-		conn.Close()
 	}
 }