From 7d83e350fd35741d7a407e200d7ab298ae422c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Wed, 7 Sep 2022 15:41:19 +0800 Subject: [PATCH] Refine test --- test/box_test.go | 4 ++++ test/clash_test.go | 4 ++++ test/go.mod | 4 ++-- test/go.sum | 8 ++++---- test/shadowtls_test.go | 5 ++++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/test/box_test.go b/test/box_test.go index ee8247fd..ef2d8767 100644 --- a/test/box_test.go +++ b/test/box_test.go @@ -22,6 +22,10 @@ func startInstance(t *testing.T, options option.Options) { options.Log = &option.LogOptions{ Level: "trace", } + } else { + options.Log = &option.LogOptions{ + Level: "warning", + } } var instance *box.Box var err error diff --git a/test/clash_test.go b/test/clash_test.go index 076fb115..c2495d09 100644 --- a/test/clash_test.go +++ b/test/clash_test.go @@ -183,6 +183,7 @@ func testPingPongWithConn(t *testing.T, port uint16, cc func() (net.Conn, error) if err != nil { return err } + defer c.Close() pingCh, pongCh, test := newPingPongPair() go func() { @@ -245,6 +246,7 @@ func testPingPongWithPacketConn(t *testing.T, port uint16, pcc func() (net.Packe if err != nil { return err } + defer pc.Close() go func() { if _, err := pc.WriteTo([]byte("ping"), rAddr); err != nil { @@ -301,6 +303,7 @@ func testLargeDataWithConn(t *testing.T, port uint16, cc func() (net.Conn, error if err != nil { return err } + defer c.Close() go func() { c, err := l.Accept() @@ -432,6 +435,7 @@ func testLargeDataWithPacketConn(t *testing.T, port uint16, pcc func() (net.Pack if err != nil { return err } + defer pc.Close() go func() { sendHash, err := writeRandData(pc, rAddr) diff --git a/test/go.mod b/test/go.mod index 45cdb42f..d85a4472 100644 --- a/test/go.mod +++ b/test/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/docker v20.10.17+incompatible github.com/docker/go-connections v0.4.0 github.com/gofrs/uuid v4.2.0+incompatible - github.com/sagernet/sing v0.0.0-20220903084300-856852af9306 + github.com/sagernet/sing v0.0.0-20220903085538-02b9ca1cc133 github.com/sagernet/sing-shadowsocks v0.0.0-20220819002358-7461bb09a8f6 github.com/spyzhov/ajson v0.7.1 github.com/stretchr/testify v1.8.0 @@ -63,7 +63,7 @@ require ( github.com/sagernet/quic-go v0.0.0-20220818150011-de611ab3e2bb // indirect github.com/sagernet/sing-dns v0.0.0-20220903082137-b1102b8fc961 // indirect github.com/sagernet/sing-tun v0.0.0-20220828031750-185b6c880a83 // indirect - github.com/sagernet/sing-vmess v0.0.0-20220903084336-d856911141f3 // indirect + github.com/sagernet/sing-vmess v0.0.0-20220907073918-72d7fdf6825f // indirect github.com/sagernet/smux v0.0.0-20220831015742-e0f1988e3195 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect diff --git a/test/go.sum b/test/go.sum index aa9eda63..22d77532 100644 --- a/test/go.sum +++ b/test/go.sum @@ -155,16 +155,16 @@ github.com/sagernet/quic-go v0.0.0-20220818150011-de611ab3e2bb h1:wc0yQ+SBn4TaTY github.com/sagernet/quic-go v0.0.0-20220818150011-de611ab3e2bb/go.mod h1:MIccjRKnPTjWwAOpl+AUGWOkzyTd9tERytudxu+1ra4= github.com/sagernet/sing v0.0.0-20220812082120-05f9836bff8f/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY= github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY= -github.com/sagernet/sing v0.0.0-20220903084300-856852af9306 h1:3xWm0qpclysy6+SAmLSKIHJ0KA6h1ncAoqZtyIr3BT4= -github.com/sagernet/sing v0.0.0-20220903084300-856852af9306/go.mod h1:kZvzh1VDa/Dg/Bt5WaYKU0jl5ept8KKDpl3Ay4gRtRQ= +github.com/sagernet/sing v0.0.0-20220903085538-02b9ca1cc133 h1:krnb8wKEFIdXhmJYlhJMbEcPsJFISy2fz90uHVz7hMU= +github.com/sagernet/sing v0.0.0-20220903085538-02b9ca1cc133/go.mod h1:kZvzh1VDa/Dg/Bt5WaYKU0jl5ept8KKDpl3Ay4gRtRQ= github.com/sagernet/sing-dns v0.0.0-20220903082137-b1102b8fc961 h1:5JeqhvCGV6AQQiAO0V67Loh2eyO3JNjIQnvRF8NnTE0= github.com/sagernet/sing-dns v0.0.0-20220903082137-b1102b8fc961/go.mod h1:vKBBy4mNJRaFuJ8H6kYIOPofsZ1JT5mgdwIlebtvnZ4= github.com/sagernet/sing-shadowsocks v0.0.0-20220819002358-7461bb09a8f6 h1:JJfDeYYhWunvtxsU/mOVNTmFQmnzGx9dY034qG6G3g4= github.com/sagernet/sing-shadowsocks v0.0.0-20220819002358-7461bb09a8f6/go.mod h1:EX3RbZvrwAkPI2nuGa78T2iQXmrkT+/VQtskjou42xM= github.com/sagernet/sing-tun v0.0.0-20220828031750-185b6c880a83 h1:SoWiHYuOCVedqA7T/CJSZUUrcPGKQb2wFKEq8DphiAI= github.com/sagernet/sing-tun v0.0.0-20220828031750-185b6c880a83/go.mod h1:76r07HS1WRcEI4mE9pFsohfTBUt1j/G9Avz6DaOP3VU= -github.com/sagernet/sing-vmess v0.0.0-20220903084336-d856911141f3 h1:/laBNKwZcSXSeovCmJuPcU3QBMPgOs6UEMnOsRZUFZg= -github.com/sagernet/sing-vmess v0.0.0-20220903084336-d856911141f3/go.mod h1:iJFqYb+zAEuQfxibatDvlzpis9SCRbDXnX4dIkge/9U= +github.com/sagernet/sing-vmess v0.0.0-20220907073918-72d7fdf6825f h1:6l9aXZqAl1JqXJWi89KHpWnM/moQUPGG+XiwMc+yD0A= +github.com/sagernet/sing-vmess v0.0.0-20220907073918-72d7fdf6825f/go.mod h1:u66Vv7NHXJWfeAmhh7JuJp/cwxmuQlM56QoZ7B7Mmd0= github.com/sagernet/smux v0.0.0-20220831015742-e0f1988e3195 h1:5VBIbVw9q7aKbrFdT83mjkyvQ+VaRsQ6yflTepfln38= github.com/sagernet/smux v0.0.0-20220831015742-e0f1988e3195/go.mod h1:yedWtra8nyGJ+SyI+ziwuaGMzBatbB10P1IOOZbbSK8= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= diff --git a/test/shadowtls_test.go b/test/shadowtls_test.go index 4c6b2156..8a02febb 100644 --- a/test/shadowtls_test.go +++ b/test/shadowtls_test.go @@ -63,6 +63,9 @@ func TestShadowTLS(t *testing.T) { DialerOptions: option.DialerOptions{ Detour: "detour", }, + MultiplexOptions: &option.MultiplexOptions{ + Enabled: true, + }, }, }, { @@ -93,7 +96,7 @@ func TestShadowTLS(t *testing.T) { }}, }, }) - testTCP(t, clientPort, testPort) + testSuit(t, clientPort, testPort) } func TestShadowTLSOutbound(t *testing.T) {