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

lib/model: Don't run watcher on recvonly tests (fixes #5110) (#5112)

Browse Source
This commit is contained in:
Jakob Borg 2018-08-11 22:19:37 +02:00 committed by GitHub
parent dfe4008607
commit b37c05c6b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/model/folder_recvonly_test.go
View File

@ -22,17 +22,35 @@ func TestRecvOnlyRevertDeletes(t *testing.T) {
// Make sure that we delete extraneous files and directories when we hit // Make sure that we delete extraneous files and directories when we hit
// Revert. // Revert.
os.RemoveAll("_recvonly") if err := os.RemoveAll("_recvonly"); err != nil && !os.IsNotExist(err) {
defer os.RemoveAll("_recvonly") t.Fatal(err)
}
defer func() {
if err := os.RemoveAll("_recvonly"); err != nil && !os.IsNotExist(err) {
t.Fatal(err)
}
}()
// Create some test data // Create some test data
os.MkdirAll("_recvonly/.stfolder", 0755) if err := os.MkdirAll("_recvonly/.stfolder", 0755); err != nil {
os.MkdirAll("_recvonly/ignDir", 0755) t.Fatal(err)
os.MkdirAll("_recvonly/unknownDir", 0755) }
ioutil.WriteFile("_recvonly/ignDir/ignFile", []byte("hello\n"), 0644) if err := os.MkdirAll("_recvonly/ignDir", 0755); err != nil {
ioutil.WriteFile("_recvonly/unknownDir/unknownFile", []byte("hello\n"), 0644) t.Fatal(err)
ioutil.WriteFile("_recvonly/.stignore", []byte("ignDir\n"), 0644) }
if err := os.MkdirAll("_recvonly/unknownDir", 0755); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile("_recvonly/ignDir/ignFile", []byte("hello\n"), 0644); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile("_recvonly/unknownDir/unknownFile", []byte("hello\n"), 0644); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile("_recvonly/.stignore", []byte("ignDir\n"), 0644); err != nil {
t.Fatal(err)
}
knownFiles := setupKnownFiles(t, []byte("hello\n")) knownFiles := setupKnownFiles(t, []byte("hello\n"))
@ -107,12 +125,20 @@ func TestRecvOnlyRevertNeeds(t *testing.T) {
// Make sure that a new file gets picked up and considered latest, then // Make sure that a new file gets picked up and considered latest, then
// gets considered old when we hit Revert. // gets considered old when we hit Revert.
os.RemoveAll("_recvonly") if err := os.RemoveAll("_recvonly"); err != nil && !os.IsNotExist(err) {
defer os.RemoveAll("_recvonly") t.Fatal(err)
}
defer func() {
if err := os.RemoveAll("_recvonly"); err != nil && !os.IsNotExist(err) {
t.Fatal(err)
}
}()
// Create some test data // Create some test data
os.MkdirAll("_recvonly/.stfolder", 0755) if err := os.MkdirAll("_recvonly/.stfolder", 0755); err != nil {
t.Fatal(err)
}
oldData := []byte("hello\n") oldData := []byte("hello\n")
knownFiles := setupKnownFiles(t, oldData) knownFiles := setupKnownFiles(t, oldData)
@ -245,6 +271,8 @@ func setupROFolder() *Model {
fcfg := config.NewFolderConfiguration(protocol.LocalDeviceID, "ro", "receive only test", fs.FilesystemTypeBasic, "_recvonly") fcfg := config.NewFolderConfiguration(protocol.LocalDeviceID, "ro", "receive only test", fs.FilesystemTypeBasic, "_recvonly")
fcfg.Type = config.FolderTypeReceiveOnly fcfg.Type = config.FolderTypeReceiveOnly
fcfg.Devices = []config.FolderDeviceConfiguration{{DeviceID: device1}} fcfg.Devices = []config.FolderDeviceConfiguration{{DeviceID: device1}}
fcfg.FSWatcherEnabled = false
fcfg.RescanIntervalS = 86400
cfg := defaultCfg.Copy() cfg := defaultCfg.Copy()
cfg.Folders = append(cfg.Folders, fcfg) cfg.Folders = append(cfg.Folders, fcfg)