From 7236d5673193f6f6aa1f745dc23479a87dd5d18b Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Wed, 30 Jan 2019 16:38:10 +0100 Subject: [PATCH] lib/model: In tests disable watching for changes by default (fixes #5246) (#5485) --- lib/model/model_test.go | 1 + lib/model/requests_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/model/model_test.go b/lib/model/model_test.go index fbb521b7e..076ab6266 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -50,6 +50,7 @@ func init() { defaultFolderConfig = config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, "testdata") defaultFolderConfig.Devices = []config.FolderDeviceConfiguration{{DeviceID: device1}} + defaultFolderConfig.FSWatcherEnabled = false defaultCfg = config.Configuration{ Version: config.CurrentVersion, Folders: []config.FolderConfiguration{defaultFolderConfig}, diff --git a/lib/model/requests_test.go b/lib/model/requests_test.go index c6d9e3d1f..ea8515bf5 100644 --- a/lib/model/requests_test.go +++ b/lib/model/requests_test.go @@ -718,6 +718,7 @@ func setupModelWithConnection() (*Model, *fakeConnection, string, *config.Wrappe cfg := defaultCfgWrapper.RawCopy() cfg.Devices = append(cfg.Devices, config.NewDeviceConfiguration(device2, "device2")) cfg.Folders[0] = config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, tmpDir) + cfg.Folders[0].FSWatcherEnabled = false cfg.Folders[0].Devices = []config.FolderDeviceConfiguration{ {DeviceID: device1}, {DeviceID: device2},