perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests on Go 1.3

Browse Source
This commit is contained in:
Jakob Borg 2016-03-08 09:07:18 +01:00
parent 09ebc33b30
commit 83c29e1945
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/protocol/protocol.test Executable file
View File

Binary file not shown.

29
lib/protocol/protocol_test.go
View File

@ -7,7 +7,6 @@ import (
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"errors" "errors"
"flag"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -27,14 +26,6 @@ var (
quickCfg = &quick.Config{} quickCfg = &quick.Config{}
) )
func TestMain(m *testing.M) {
flag.Parse()
if flag.Lookup("test.short").Value.String() != "false" {
quickCfg.MaxCount = 10
}
os.Exit(m.Run())
}
func TestHeaderEncodeDecode(t *testing.T) { func TestHeaderEncodeDecode(t *testing.T) {
f := func(ver, id, typ int) bool { f := func(ver, id, typ int) bool {
ver = int(uint(ver) % 16) ver = int(uint(ver) % 16)
@ -208,6 +199,10 @@ func TestElementSizeExceededNested(t *testing.T) {
} }
func TestMarshalIndexMessage(t *testing.T) { func TestMarshalIndexMessage(t *testing.T) {
if testing.Short() {
quickCfg.MaxCount = 10
}
f := func(m1 IndexMessage) bool { f := func(m1 IndexMessage) bool {
if len(m1.Options) == 0 { if len(m1.Options) == 0 {
m1.Options = nil m1.Options = nil
@ -238,6 +233,10 @@ func TestMarshalIndexMessage(t *testing.T) {
} }
func TestMarshalRequestMessage(t *testing.T) { func TestMarshalRequestMessage(t *testing.T) {
if testing.Short() {
quickCfg.MaxCount = 10
}
f := func(m1 RequestMessage) bool { f := func(m1 RequestMessage) bool {
if len(m1.Options) == 0 { if len(m1.Options) == 0 {
m1.Options = nil m1.Options = nil
@ -254,6 +253,10 @@ func TestMarshalRequestMessage(t *testing.T) {
} }
func TestMarshalResponseMessage(t *testing.T) { func TestMarshalResponseMessage(t *testing.T) {
if testing.Short() {
quickCfg.MaxCount = 10
}
f := func(m1 ResponseMessage) bool { f := func(m1 ResponseMessage) bool {
if len(m1.Data) == 0 { if len(m1.Data) == 0 {
m1.Data = nil m1.Data = nil
@ -267,6 +270,10 @@ func TestMarshalResponseMessage(t *testing.T) {
} }
func TestMarshalClusterConfigMessage(t *testing.T) { func TestMarshalClusterConfigMessage(t *testing.T) {
if testing.Short() {
quickCfg.MaxCount = 10
}
f := func(m1 ClusterConfigMessage) bool { f := func(m1 ClusterConfigMessage) bool {
if len(m1.Options) == 0 { if len(m1.Options) == 0 {
m1.Options = nil m1.Options = nil
@ -291,6 +298,10 @@ func TestMarshalClusterConfigMessage(t *testing.T) {
} }
func TestMarshalCloseMessage(t *testing.T) { func TestMarshalCloseMessage(t *testing.T) {
if testing.Short() {
quickCfg.MaxCount = 10
}
f := func(m1 CloseMessage) bool { f := func(m1 CloseMessage) bool {
return testMarshal(t, "close", &m1, &CloseMessage{}) return testMarshal(t, "close", &m1, &CloseMessage{})
} }