mirror of
https://github.com/octoleo/syncthing.git
synced 2025-01-03 07:12:27 +00:00
lib/model: Improve test for unignored parent directories (#8926)
This commit is contained in:
parent
f7da96fb82
commit
81a4b22d43
@ -2826,23 +2826,27 @@ func TestParentOfUnignored(t *testing.T) {
|
|||||||
w, fcfg, wCancel := newDefaultCfgWrapper()
|
w, fcfg, wCancel := newDefaultCfgWrapper()
|
||||||
defer wCancel()
|
defer wCancel()
|
||||||
ffs := fcfg.Filesystem(nil)
|
ffs := fcfg.Filesystem(nil)
|
||||||
defer ffs.Remove(".stignore")
|
|
||||||
|
|
||||||
fd, err := ffs.Create("baz")
|
must(t, ffs.Mkdir("bar", 0o755))
|
||||||
must(t, err)
|
must(t, ffs.Mkdir("baz", 0o755))
|
||||||
fd.Close()
|
must(t, ffs.Mkdir("baz/quux", 0o755))
|
||||||
|
|
||||||
m := setupModel(t, w)
|
m := setupModel(t, w)
|
||||||
defer cleanupModel(m)
|
defer cleanupModel(m)
|
||||||
|
|
||||||
|
m.SetIgnores("default", []string{"!quux", "*"})
|
||||||
m.ScanFolder("default")
|
m.ScanFolder("default")
|
||||||
|
|
||||||
m.SetIgnores("default", []string{"!quux", "*"})
|
if bar, ok := m.testCurrentFolderFile("default", "bar"); !ok {
|
||||||
|
t.Error(`Directory "bar" missing in db`)
|
||||||
|
} else if !bar.IsIgnored() {
|
||||||
|
t.Error(`Directory "bar" is not ignored`)
|
||||||
|
}
|
||||||
|
|
||||||
if parent, ok := m.testCurrentFolderFile("default", "baz"); !ok {
|
if baz, ok := m.testCurrentFolderFile("default", "baz"); !ok {
|
||||||
t.Errorf(`Directory "baz" missing in db`)
|
t.Error(`Directory "baz" missing in db`)
|
||||||
} else if parent.IsIgnored() {
|
} else if baz.IsIgnored() {
|
||||||
t.Errorf(`Directory "baz" is ignored`)
|
t.Error(`Directory "baz" is ignored`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user