lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-27 22:36:12 -04:00
Code Issues Releases Wiki Activity

fix test break

Browse Source
This commit is contained in:
Darien Raymond 2015-12-04 16:01:39 +00:00
parent 3327cb0b80
commit 30be218c62
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/scenarios/data/test_1_client.json
View File

@ -4,7 +4,7 @@
"protocol": "socks",
"settings": {
"auth": "noauth",
"udp": false,
"udp": true,
"ip": "127.0.0.1"
}
},

40
testing/scenarios/socks_end_test.go
View File

@ -12,6 +12,28 @@ import (
"github.com/v2ray/v2ray-core/testing/servers/udp"
)
var (
serverUp = false
)
func setupServer() error {
if serverUp {
return nil
}
err := InitializeServer(TestFile("test_1_client.json"))
if err != nil {
return err
}
err = InitializeServer(TestFile("test_1_server.json"))
if err != nil {
return err
}
serverUp = true
return nil
}
func TestTCPConnection(t *testing.T) {
v2testing.Current(t)
@ -28,11 +50,7 @@ func TestTCPConnection(t *testing.T) {
_, err := tcpServer.Start()
assert.Error(err).IsNil()
err = InitializeServer(TestFile("test_1_client.json"))
assert.Error(err).IsNil()
err = InitializeServer(TestFile("test_1_server.json"))
assert.Error(err).IsNil()
assert.Error(setupServer()).IsNil()
socksPort := v2net.Port(50000)
@ -99,11 +117,7 @@ func TestTCPBind(t *testing.T) {
_, err := tcpServer.Start()
assert.Error(err).IsNil()
err = InitializeServer(TestFile("test_1_client.json"))
assert.Error(err).IsNil()
err = InitializeServer(TestFile("test_1_server.json"))
assert.Error(err).IsNil()
assert.Error(setupServer()).IsNil()
socksPort := v2net.Port(50000)
@ -151,11 +165,7 @@ func TestUDPAssociate(t *testing.T) {
_, err := udpServer.Start()
assert.Error(err).IsNil()
err = InitializeServer(TestFile("test_1_client.json"))
assert.Error(err).IsNil()
err = InitializeServer(TestFile("test_1_server.json"))
assert.Error(err).IsNil()
assert.Error(setupServer()).IsNil()
socksPort := v2net.Port(50000)