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

lib/model: Don't use LocalDeviceID as normal id in tests (#5512)

Browse Source
This commit is contained in:
Simon Frei
2019-02-06 09:32:03 +01:00
committed by Jakob Borg
parent b076031bfa
commit 2f415d8f09
4 changed files with 98 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/folder_recvonly_test.go
View File

@@ -337,7 +337,7 @@ func setupKnownFiles(t *testing.T, data []byte) []protocol.FileInfo {
}
func setupROFolder() *Model {
fcfg := config.NewFolderConfiguration(protocol.LocalDeviceID, "ro", "receive only test", fs.FilesystemTypeBasic, "_recvonly")
fcfg := config.NewFolderConfiguration(myID, "ro", "receive only test", fs.FilesystemTypeBasic, "_recvonly")
fcfg.Type = config.FolderTypeReceiveOnly
fcfg.Devices = []config.FolderDeviceConfiguration{{DeviceID: device1}}
fcfg.FSWatcherEnabled = false
@@ -349,7 +349,7 @@ func setupROFolder() *Model {
wrp := config.Wrap("/dev/null", cfg)
db := db.OpenMemory()
m := NewModel(wrp, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
m := NewModel(wrp, myID, "syncthing", "dev", db, nil)
m.ServeBackground()
m.AddFolder(fcfg)