From 9ec2bb9b878d8baad27cb498a99b9036b0e1fbdb Mon Sep 17 00:00:00 2001
From: ginuerzh <ginuerzh@gmail.com>
Date: Fri, 21 Jun 2019 21:30:48 +0800
Subject: [PATCH] fix tests

---
 http2.go      | 1 -
 http2_test.go | 9 +++++----
 kcp_test.go   | 1 +
 quic_test.go  | 1 +
 ssh_test.go   | 1 +
 tls_test.go   | 2 ++
 ws_test.go    | 2 ++
 wss_test.go   | 2 ++
 8 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/http2.go b/http2.go
index 5027d00..4446e99 100644
--- a/http2.go
+++ b/http2.go
@@ -135,7 +135,6 @@ func (tr *http2Transporter) Dial(addr string, options ...DialOption) (net.Conn,
 		// So we should try to connect the server.
 		conn, err := opts.Chain.Dial(addr)
 		if err != nil {
-
 			return nil, err
 		}
 		conn.Close()
diff --git a/http2_test.go b/http2_test.go
index a1df2e3..4eb5c03 100644
--- a/http2_test.go
+++ b/http2_test.go
@@ -508,6 +508,7 @@ func h2ForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
@@ -905,6 +906,7 @@ func h2cForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
@@ -1046,16 +1048,15 @@ func TestHTTP2ProxyWithHostProbeResist(t *testing.T) {
 
 	req := &http.Request{
 		Method:        http.MethodConnect,
-		URL:           &url.URL{Scheme: "https", Host: ln.Addr().String()},
+		URL:           &url.URL{Scheme: "https", Host: cc.addr},
 		Header:        make(http.Header),
 		Proto:         "HTTP/2.0",
 		ProtoMajor:    2,
 		ProtoMinor:    0,
 		Body:          ioutil.NopCloser(bytes.NewReader(sendData)),
-		Host:          cc.addr,
-		ContentLength: -1,
+		Host:          "github.com:443",
+		ContentLength: int64(len(sendData)),
 	}
-	req.Header.Set("Gost-Target", "github.com:443")
 
 	resp, err := cc.client.Do(req)
 	if err != nil {
diff --git a/kcp_test.go b/kcp_test.go
index 0e915a0..d9e6ba0 100644
--- a/kcp_test.go
+++ b/kcp_test.go
@@ -386,6 +386,7 @@ func kcpForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
diff --git a/quic_test.go b/quic_test.go
index 77231c1..3247490 100644
--- a/quic_test.go
+++ b/quic_test.go
@@ -387,6 +387,7 @@ func quicForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
diff --git a/ssh_test.go b/ssh_test.go
index db3638e..20d24f0 100644
--- a/ssh_test.go
+++ b/ssh_test.go
@@ -559,6 +559,7 @@ func sshForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
diff --git a/tls_test.go b/tls_test.go
index 79eed68..1d74ce8 100644
--- a/tls_test.go
+++ b/tls_test.go
@@ -388,6 +388,7 @@ func tlsForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
@@ -787,6 +788,7 @@ func mtlsForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
diff --git a/ws_test.go b/ws_test.go
index 1ea9d63..11899c9 100644
--- a/ws_test.go
+++ b/ws_test.go
@@ -386,6 +386,7 @@ func wsForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
@@ -785,6 +786,7 @@ func mwsForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
diff --git a/wss_test.go b/wss_test.go
index 2c8719a..a213480 100644
--- a/wss_test.go
+++ b/wss_test.go
@@ -387,6 +387,7 @@ func wssForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()
@@ -786,6 +787,7 @@ func mwssForwardTunnelRoundtrip(targetURL string, data []byte) error {
 		Listener: ln,
 		Handler:  TCPDirectForwardHandler(u.Host),
 	}
+	server.Handler.Init()
 
 	go server.Run()
 	defer server.Close()