From a6a9af4f0234c6244a9302b1bf00423a1ea8d6a1 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Fri, 4 Mar 2016 14:16:27 +0100
Subject: [PATCH] Fix marshalling tests for Go 1.6

---
 lib/protocol/protocol_test.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go
index 4aa8c670..8192a245 100644
--- a/lib/protocol/protocol_test.go
+++ b/lib/protocol/protocol_test.go
@@ -212,6 +212,9 @@ func TestMarshalIndexMessage(t *testing.T) {
 		if len(m1.Options) == 0 {
 			m1.Options = nil
 		}
+		if len(m1.Files) == 0 {
+			m1.Files = nil
+		}
 		for i, f := range m1.Files {
 			m1.Files[i].CachedSize = 0
 			if len(f.Blocks) == 0 {
@@ -239,6 +242,9 @@ func TestMarshalRequestMessage(t *testing.T) {
 		if len(m1.Options) == 0 {
 			m1.Options = nil
 		}
+		if len(m1.Hash) == 0 {
+			m1.Hash = nil
+		}
 		return testMarshal(t, "request", &m1, &RequestMessage{})
 	}
 
@@ -265,6 +271,17 @@ func TestMarshalClusterConfigMessage(t *testing.T) {
 		if len(m1.Options) == 0 {
 			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{})
 	}