Skip to content

Commit 9ec2bb9

Browse files
committed
fix tests
1 parent e996e7c commit 9ec2bb9

File tree

8 files changed

+14
-5
lines changed

8 files changed

+14
-5
lines changed

http2.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ func (tr *http2Transporter) Dial(addr string, options ...DialOption) (net.Conn,
135135
// So we should try to connect the server.
136136
conn, err := opts.Chain.Dial(addr)
137137
if err != nil {
138-
139138
return nil, err
140139
}
141140
conn.Close()

http2_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ func h2ForwardTunnelRoundtrip(targetURL string, data []byte) error {
508508
Listener: ln,
509509
Handler: TCPDirectForwardHandler(u.Host),
510510
}
511+
server.Handler.Init()
511512

512513
go server.Run()
513514
defer server.Close()
@@ -905,6 +906,7 @@ func h2cForwardTunnelRoundtrip(targetURL string, data []byte) error {
905906
Listener: ln,
906907
Handler: TCPDirectForwardHandler(u.Host),
907908
}
909+
server.Handler.Init()
908910

909911
go server.Run()
910912
defer server.Close()
@@ -1046,16 +1048,15 @@ func TestHTTP2ProxyWithHostProbeResist(t *testing.T) {
10461048

10471049
req := &http.Request{
10481050
Method: http.MethodConnect,
1049-
URL: &url.URL{Scheme: "https", Host: ln.Addr().String()},
1051+
URL: &url.URL{Scheme: "https", Host: cc.addr},
10501052
Header: make(http.Header),
10511053
Proto: "HTTP/2.0",
10521054
ProtoMajor: 2,
10531055
ProtoMinor: 0,
10541056
Body: ioutil.NopCloser(bytes.NewReader(sendData)),
1055-
Host: cc.addr,
1056-
ContentLength: -1,
1057+
Host: "github.com:443",
1058+
ContentLength: int64(len(sendData)),
10571059
}
1058-
req.Header.Set("Gost-Target", "github.com:443")
10591060

10601061
resp, err := cc.client.Do(req)
10611062
if err != nil {

kcp_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ func kcpForwardTunnelRoundtrip(targetURL string, data []byte) error {
386386
Listener: ln,
387387
Handler: TCPDirectForwardHandler(u.Host),
388388
}
389+
server.Handler.Init()
389390

390391
go server.Run()
391392
defer server.Close()

quic_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ func quicForwardTunnelRoundtrip(targetURL string, data []byte) error {
387387
Listener: ln,
388388
Handler: TCPDirectForwardHandler(u.Host),
389389
}
390+
server.Handler.Init()
390391

391392
go server.Run()
392393
defer server.Close()

ssh_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ func sshForwardTunnelRoundtrip(targetURL string, data []byte) error {
559559
Listener: ln,
560560
Handler: TCPDirectForwardHandler(u.Host),
561561
}
562+
server.Handler.Init()
562563

563564
go server.Run()
564565
defer server.Close()

tls_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ func tlsForwardTunnelRoundtrip(targetURL string, data []byte) error {
388388
Listener: ln,
389389
Handler: TCPDirectForwardHandler(u.Host),
390390
}
391+
server.Handler.Init()
391392

392393
go server.Run()
393394
defer server.Close()
@@ -787,6 +788,7 @@ func mtlsForwardTunnelRoundtrip(targetURL string, data []byte) error {
787788
Listener: ln,
788789
Handler: TCPDirectForwardHandler(u.Host),
789790
}
791+
server.Handler.Init()
790792

791793
go server.Run()
792794
defer server.Close()

ws_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ func wsForwardTunnelRoundtrip(targetURL string, data []byte) error {
386386
Listener: ln,
387387
Handler: TCPDirectForwardHandler(u.Host),
388388
}
389+
server.Handler.Init()
389390

390391
go server.Run()
391392
defer server.Close()
@@ -785,6 +786,7 @@ func mwsForwardTunnelRoundtrip(targetURL string, data []byte) error {
785786
Listener: ln,
786787
Handler: TCPDirectForwardHandler(u.Host),
787788
}
789+
server.Handler.Init()
788790

789791
go server.Run()
790792
defer server.Close()

wss_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ func wssForwardTunnelRoundtrip(targetURL string, data []byte) error {
387387
Listener: ln,
388388
Handler: TCPDirectForwardHandler(u.Host),
389389
}
390+
server.Handler.Init()
390391

391392
go server.Run()
392393
defer server.Close()
@@ -786,6 +787,7 @@ func mwssForwardTunnelRoundtrip(targetURL string, data []byte) error {
786787
Listener: ln,
787788
Handler: TCPDirectForwardHandler(u.Host),
788789
}
790+
server.Handler.Init()
789791

790792
go server.Run()
791793
defer server.Close()

0 commit comments

Comments
 (0)