octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-14 01:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Fix tests not to require Go 1.9

Browse Source
This commit is contained in:
Audrius Butkevicius 2017-10-12 22:36:20 +01:00
parent 06da67e6fc
commit becbb3b123
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/model/model_test.go
View File

@ -1914,19 +1914,10 @@ func TestIssue4357(t *testing.T) {
m.ServeBackground() m.ServeBackground()
defer m.Stop() defer m.Stop()
// Replace kicks off CommitConfiguration in multiple routines which we // Force the model to wire itself and add the folders
// have no idea when they get called, so sleep a bit :(
// We could make replace blocking for all routines to come back without
// holding the lock, but that's a bit much just to make a test.
replaceCfg := func(cfg config.Configuration) {
t.Helper()
if err := wrapper.ReplaceBlocking(cfg); err != nil { if err := wrapper.ReplaceBlocking(cfg); err != nil {
t.Error(err) t.Error(err)
} }
}
// Force the model to wire itself and add the folders
replaceCfg(cfg)
if _, ok := m.folderCfgs["default"]; !ok { if _, ok := m.folderCfgs["default"]; !ok {
t.Error("Folder should be running") t.Error("Folder should be running")
@ -1935,7 +1926,9 @@ func TestIssue4357(t *testing.T) {
newCfg := wrapper.RawCopy() newCfg := wrapper.RawCopy()
newCfg.Folders[0].Paused = true newCfg.Folders[0].Paused = true
replaceCfg(newCfg) if err := wrapper.ReplaceBlocking(newCfg); err != nil {
t.Error(err)
}
if _, ok := m.folderCfgs["default"]; ok { if _, ok := m.folderCfgs["default"]; ok {
t.Error("Folder should not be running") t.Error("Folder should not be running")
@ -1945,14 +1938,18 @@ func TestIssue4357(t *testing.T) {
t.Error("should still have folder in config") t.Error("should still have folder in config")
} }
replaceCfg(config.Configuration{}) if err := wrapper.ReplaceBlocking(config.Configuration{}); err != nil {
t.Error(err)
}
if _, ok := m.cfg.Folder("default"); ok { if _, ok := m.cfg.Folder("default"); ok {
t.Error("should not have folder in config") t.Error("should not have folder in config")
} }
// Add the folder back, should be running // Add the folder back, should be running
replaceCfg(cfg) if err := wrapper.ReplaceBlocking(cfg); err != nil {
t.Error(err)
}
if _, ok := m.folderCfgs["default"]; !ok { if _, ok := m.folderCfgs["default"]; !ok {
t.Error("Folder should be running") t.Error("Folder should be running")
@ -1962,7 +1959,9 @@ func TestIssue4357(t *testing.T) {
} }
// Should not panic when removing a running folder. // Should not panic when removing a running folder.
replaceCfg(config.Configuration{}) if err := wrapper.ReplaceBlocking(config.Configuration{}); err != nil {
t.Error(err)
}
if _, ok := m.folderCfgs["default"]; ok { if _, ok := m.folderCfgs["default"]; ok {
t.Error("Folder should not be running") t.Error("Folder should not be running")