From a32ac62208cef0ccca74ca2cf24d89865e0e8404 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 22 Oct 2015 13:49:41 +0200 Subject: [PATCH] Don't expect ending slash on Windows --- lib/config/config_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/config/config_test.go b/lib/config/config_test.go index 3609764b..64623997 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -91,7 +91,7 @@ func TestDeviceConfig(t *testing.T) { expectedFolders := []FolderConfiguration{ { ID: "test", - RawPath: "testdata" + string(filepath.Separator), + RawPath: "testdata", Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}}, ReadOnly: true, RescanIntervalS: 600, @@ -103,6 +103,11 @@ func TestDeviceConfig(t *testing.T) { MaxConflicts: -1, }, } + + if runtime.GOOS != "windows" { + expectedFolders[0].RawPath += string(filepath.Separator) + } + expectedDevices := []DeviceConfiguration{ { DeviceID: device1,