Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ginuerzh committed Jun 21, 2019
1 parent e996e7c commit 9ec2bb9
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 5 deletions.
1 change: 0 additions & 1 deletion http2.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
9 changes: 5 additions & 4 deletions http2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions kcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions quic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions ssh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions ws_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions wss_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 9ec2bb9

Please sign in to comment.