Fix test break

This commit is contained in:
V2Ray
2015-09-20 00:11:14 +02:00
parent 075753c030
commit b40be74b86
15 changed files with 50 additions and 48 deletions
+6 -7
View File
@@ -19,13 +19,12 @@ function test_package {
echo "mode: set" > coverall.out
test_package "." "."
test_package "io/socks" "io/socks"
test_package "io/vmess" "hash,io,io/vmess"
test_package "math" "math"
test_package "net" "net"
test_package "net/socks" ".,io/socks,net,net/socks"
test_package "net/vmess" ".,io,math,net,net/vmess"
test_package "common/net" "common/net"
test_package "proxy/socks" "proxy/socks,proxy/socks/protocol"
test_package "proxy/socks/protocol" "proxy/socks/protocol"
test_package "proxy/vmess" "common/io,common/net,proxy/vmess,proxy/vmess/protocol,proxy/vmess/protocol/user"
test_package "proxy/vmess/protocol" "proxy/vmess/protocol,proxy/vmess/protocol/user"
test_package "proxy/vmess/protocol/user" "proxy/vmess/protocol/user"
if [ "$FAIL" -eq 0 ]; then
$HOME/gopath/bin/goveralls -v -coverprofile=coverall.out -service=travis-ci -repotoken $COVERALLS_TOKEN
+4 -4
View File
@@ -1,21 +1,21 @@
package mocks
import (
"github.com/v2ray/v2ray-core/proxy/vmess/protocol"
"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
)
type MockUserSet struct {
UserIds []protocol.ID
UserIds []user.ID
UserHashes map[string]int
Timestamps map[string]int64
}
func (us *MockUserSet) AddUser(user protocol.User) error {
func (us *MockUserSet) AddUser(user user.User) error {
us.UserIds = append(us.UserIds, user.Id)
return nil
}
func (us *MockUserSet) GetUser(userhash []byte) (*protocol.ID, int64, bool) {
func (us *MockUserSet) GetUser(userhash []byte) (*user.ID, int64, bool) {
idx, found := us.UserHashes[string(userhash)]
if found {
return &us.UserIds[idx], us.Timestamps[string(userhash)], true