lib/model: Introduce setupModel test utility (#5524)

2019-02-12 13:18:13 +01:00
parent dc929946fe
commit d85ef949be
2 changed files with 43 additions and 154 deletions
--- a/lib/model/requests_test.go
+++ b/lib/model/requests_test.go
@@ -740,11 +740,7 @@ func setupModelWithConnection() (*Model, *fakeConnection, string, *config.Wrappe
 }

 func setupModelWithConnectionFromWrapper(w *config.Wrapper) (*Model, *fakeConnection) {
-	db := db.OpenMemory()
-	m := NewModel(w, myID, "syncthing", "dev", db, nil)
-	m.AddFolder(w.FolderList()[0])
-	m.ServeBackground()
-	m.StartFolder("default")
+	m := setupModel(w)

 	fc := addFakeConn(m, device1)
 	fc.folder = "default"