octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-08 17:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix marshalling tests for Go 1.6

Browse Source
This commit is contained in:
Jakob Borg 2016-03-04 14:16:27 +01:00
parent 35dc173c80
commit a6a9af4f02
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/protocol/protocol_test.go
View File

@ -212,6 +212,9 @@ func TestMarshalIndexMessage(t *testing.T) {
if len(m1.Options) == 0 { if len(m1.Options) == 0 {
m1.Options = nil m1.Options = nil
} }
if len(m1.Files) == 0 {
m1.Files = nil
}
for i, f := range m1.Files { for i, f := range m1.Files {
m1.Files[i].CachedSize = 0 m1.Files[i].CachedSize = 0
if len(f.Blocks) == 0 { if len(f.Blocks) == 0 {
@ -239,6 +242,9 @@ func TestMarshalRequestMessage(t *testing.T) {
if len(m1.Options) == 0 { if len(m1.Options) == 0 {
m1.Options = nil m1.Options = nil
} }
if len(m1.Hash) == 0 {
m1.Hash = nil
}
return testMarshal(t, "request", &m1, &RequestMessage{}) return testMarshal(t, "request", &m1, &RequestMessage{})
} }
@ -265,6 +271,17 @@ func TestMarshalClusterConfigMessage(t *testing.T) {
if len(m1.Options) == 0 { if len(m1.Options) == 0 {
m1.Options = nil m1.Options = nil
} }
if len(m1.Folders) == 0 {
m1.Folders = nil
}
for i := range m1.Folders {
if len(m1.Folders[i].Devices) == 0 {
m1.Folders[i].Devices = nil
}
if len(m1.Folders[i].Options) == 0 {
m1.Folders[i].Options = nil
}
}
return testMarshal(t, "clusterconfig", &m1, &ClusterConfigMessage{}) return testMarshal(t, "clusterconfig", &m1, &ClusterConfigMessage{})
} }