From 9d2407f4e41f9e4394f39d80a388811af900287e Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Wed, 2 Nov 2016 16:41:02 +0100 Subject: [PATCH] fix test break --- common/protocol/server_picker_test.go | 10 +++++----- tools/conf/vmess_test.go | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/protocol/server_picker_test.go b/common/protocol/server_picker_test.go index ac1e1cc01..0af11c30f 100644 --- a/common/protocol/server_picker_test.go +++ b/common/protocol/server_picker_test.go @@ -13,9 +13,9 @@ func TestServerList(t *testing.T) { assert := assert.On(t) list := NewServerList() - list.AddServer(NewServerSpec(nil, v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(1)), AlwaysValid())) + list.AddServer(NewServerSpec(v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(1)), AlwaysValid())) assert.Uint32(list.Size()).Equals(1) - list.AddServer(NewServerSpec(nil, v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(2)), BeforeTime(time.Now().Add(time.Second)))) + list.AddServer(NewServerSpec(v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(2)), BeforeTime(time.Now().Add(time.Second)))) assert.Uint32(list.Size()).Equals(2) server := list.GetServer(1) @@ -32,9 +32,9 @@ func TestServerPicker(t *testing.T) { assert := assert.On(t) list := NewServerList() - list.AddServer(NewServerSpec(nil, v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(1)), AlwaysValid())) - list.AddServer(NewServerSpec(nil, v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(2)), BeforeTime(time.Now().Add(time.Second)))) - list.AddServer(NewServerSpec(nil, v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(3)), BeforeTime(time.Now().Add(time.Second)))) + list.AddServer(NewServerSpec(v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(1)), AlwaysValid())) + list.AddServer(NewServerSpec(v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(2)), BeforeTime(time.Now().Add(time.Second)))) + list.AddServer(NewServerSpec(v2net.TCPDestination(v2net.LocalHostIP, v2net.Port(3)), BeforeTime(time.Now().Add(time.Second)))) picker := NewRoundRobinServerPicker(list) server := picker.PickServer() diff --git a/tools/conf/vmess_test.go b/tools/conf/vmess_test.go index 15c4c59ea..88bc1ac78 100644 --- a/tools/conf/vmess_test.go +++ b/tools/conf/vmess_test.go @@ -5,7 +5,6 @@ import ( "testing" "v2ray.com/core/common/protocol" - "v2ray.com/core/proxy/vmess" "v2ray.com/core/proxy/vmess/outbound" "v2ray.com/core/testing/assert" . "v2ray.com/core/tools/conf" @@ -40,6 +39,6 @@ func TestConfigTargetParsing(t *testing.T) { config := iConfig.(*outbound.Config) specPB := config.Receiver[0] - spec := protocol.NewServerSpecFromPB(vmess.NewAccount, *specPB) + spec := protocol.NewServerSpecFromPB(*specPB) assert.Destination(spec.Destination()).EqualsString("tcp:127.0.0.1:80") }