github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix websocket test

pull/861/head
Darien Raymond 2018-02-08 16:39:18 +01:00
parent 9fdb783729
commit acc6ea3e6b
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
transport/internet/websocket/ws_test.go
View File

@ -18,7 +18,7 @@ func Test_listenWSAndDial(t *testing.T) {
assert := With(t) assert := With(t)
listen, err := ListenWS(internet.ContextWithTransportSettings(context.Background(), &Config{ listen, err := ListenWS(internet.ContextWithTransportSettings(context.Background(), &Config{
Path: "ws", Path: "ws",
}), net.DomainAddress("localhost"), 13146, func(ctx context.Context, conn internet.Connection) bool { }), net.DomainAddress("localhost"), 13146, func(conn internet.Connection) {
go func(c internet.Connection) { go func(c internet.Connection) {
defer c.Close() defer c.Close()
@ -33,7 +33,6 @@ func Test_listenWSAndDial(t *testing.T) {
_, err = c.Write([]byte("Response")) _, err = c.Write([]byte("Response"))
assert(err, IsNil) assert(err, IsNil)
}(conn) }(conn)
return true
}) })
assert(err, IsNil) assert(err, IsNil)
@ -67,7 +66,7 @@ func TestDialWithRemoteAddr(t *testing.T) {
assert := With(t) assert := With(t)
listen, err := ListenWS(internet.ContextWithTransportSettings(context.Background(), &Config{ listen, err := ListenWS(internet.ContextWithTransportSettings(context.Background(), &Config{
Path: "ws", Path: "ws",
}), net.DomainAddress("localhost"), 13148, func(ctx context.Context, conn internet.Connection) bool { }), net.DomainAddress("localhost"), 13148, func(conn internet.Connection) {
go func(c internet.Connection) { go func(c internet.Connection) {
defer c.Close() defer c.Close()
@ -84,7 +83,6 @@ func TestDialWithRemoteAddr(t *testing.T) {
_, err = c.Write([]byte("Response")) _, err = c.Write([]byte("Response"))
assert(err, IsNil) assert(err, IsNil)
}(conn) }(conn)
return true
}) })
assert(err, IsNil) assert(err, IsNil)
@ -115,11 +113,10 @@ func Test_listenWSAndDial_TLS(t *testing.T) {
AllowInsecure: true, AllowInsecure: true,
Certificate: []*v2tls.Certificate{tlsgen.GenerateCertificateForTest()}, Certificate: []*v2tls.Certificate{tlsgen.GenerateCertificateForTest()},
}) })
listen, err := ListenWS(ctx, net.DomainAddress("localhost"), 13143, func(ctx context.Context, conn internet.Connection) bool { listen, err := ListenWS(ctx, net.DomainAddress("localhost"), 13143, func(conn internet.Connection) {
go func() { go func() {
_ = conn.Close() _ = conn.Close()
}() }()
return true
}) })
assert(err, IsNil) assert(err, IsNil)
defer listen.Close() defer listen.Close()