perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Also handle ServeBackground (#6173)

Browse Source
This commit is contained in:
Simon Frei
2019-11-22 21:30:16 +01:00
committed by GitHub
parent de886b3f22
commit 65d4dd32cb
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/model/model_test.go
View File

@@ -406,9 +406,11 @@ func TestClusterConfig(t *testing.T) {
wrapper := createTmpWrapper(cfg)
m := newModel(wrapper, myID, "syncthing", "dev", db, nil)
m.addFolder(cfg.Folders[0])
m.addFolder(cfg.Folders[1])
m.ServeBackground()
for _, fcfg := range cfg.Folders {
m.removeFolder(fcfg)
m.addFolder(fcfg)
}
defer cleanupModel(m)
cm := m.generateClusterConfig(device2)
@@ -1556,8 +1558,6 @@ func TestROScanRecovery(t *testing.T) {
testOs.RemoveAll(fcfg.Path)
m := newModel(cfg, myID, "syncthing", "dev", ldb, nil)
m.addFolder(fcfg)
m.startFolder("default")
m.ServeBackground()
defer cleanupModel(m)
@@ -1609,8 +1609,6 @@ func TestRWScanRecovery(t *testing.T) {
testOs.RemoveAll(fcfg.Path)
m := newModel(cfg, myID, "syncthing", "dev", ldb, nil)
m.addFolder(fcfg)
m.startFolder("default")
m.ServeBackground()
defer cleanupModel(m)
@@ -1637,8 +1635,9 @@ func TestRWScanRecovery(t *testing.T) {
func TestGlobalDirectoryTree(t *testing.T) {
db := db.OpenMemory()
m := newModel(defaultCfgWrapper, myID, "syncthing", "dev", db, nil)
m.addFolder(defaultFolderConfig)
m.ServeBackground()
m.removeFolder(defaultFolderConfig)
m.addFolder(defaultFolderConfig)
defer cleanupModel(m)
b := func(isfile bool, path ...string) protocol.FileInfo {
@@ -1889,8 +1888,9 @@ func TestGlobalDirectoryTree(t *testing.T) {
func TestGlobalDirectorySelfFixing(t *testing.T) {
db := db.OpenMemory()
m := newModel(defaultCfgWrapper, myID, "syncthing", "dev", db, nil)
m.addFolder(defaultFolderConfig)
m.ServeBackground()
m.removeFolder(defaultFolderConfig)
m.addFolder(defaultFolderConfig)
defer cleanupModel(m)
b := func(isfile bool, path ...string) protocol.FileInfo {
@@ -2065,8 +2065,9 @@ func BenchmarkTree_100_10(b *testing.B) {
func benchmarkTree(b *testing.B, n1, n2 int) {
db := db.OpenMemory()
m := newModel(defaultCfgWrapper, myID, "syncthing", "dev", db, nil)
m.addFolder(defaultFolderConfig)
m.ServeBackground()
m.removeFolder(defaultFolderConfig)
m.addFolder(defaultFolderConfig)
defer cleanupModel(m)
m.ScanFolder("default")
@@ -2270,8 +2271,8 @@ func TestIndexesForUnknownDevicesDropped(t *testing.T) {
// Remote sequence is cached, hence need to recreated.
files = db.NewFileSet("default", defaultFs, dbi)
if len(files.ListDevices()) != 1 {
t.Error("Expected one device")
if l := len(files.ListDevices()); l != 1 {
t.Errorf("Expected one device got %v", l)
}
}
@@ -2702,8 +2703,6 @@ func TestCustomMarkerName(t *testing.T) {
defer testOs.RemoveAll(fcfg.Path)
m := newModel(cfg, myID, "syncthing", "dev", ldb, nil)
m.addFolder(fcfg)
m.startFolder("default")
m.ServeBackground()
defer cleanupModel(m)