Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Unflake TestPullInvalidIgnoredSR/SO (fixes #5796) (#5799)

This commit is contained in:
Simon Frei 2019-06-17 14:23:28 +02:00 committed by Jakob Borg
parent 02752af862
commit cea5962417
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/model/requests_test.go
View File

@ -362,9 +362,13 @@ func pullInvalidIgnored(t *testing.T, ft config.FolderType) {
} }
done = make(chan struct{}) done = make(chan struct{})
expected := map[string]struct{}{ign: {}, ignExisting: {}}
// The indexes will normally arrive in one update, but it is possible
// that they arrive in separate ones.
secondIndex := false
fc.mut.Lock() fc.mut.Lock()
fc.indexFn = func(folder string, fs []protocol.FileInfo) { fc.indexFn = func(folder string, fs []protocol.FileInfo) {
expected := map[string]struct{}{ign: {}, ignExisting: {}} secondIndex = true
for _, f := range fs { for _, f := range fs {
if _, ok := expected[f.Name]; !ok { if _, ok := expected[f.Name]; !ok {
t.Fatalf("Unexpected file %v was updated in index", f.Name) t.Fatalf("Unexpected file %v was updated in index", f.Name)
@ -387,10 +391,11 @@ func pullInvalidIgnored(t *testing.T, ft config.FolderType) {
} }
delete(expected, f.Name) delete(expected, f.Name)
} }
for name := range expected { if len(expected) == 0 {
t.Errorf("File %v wasn't updated in index", name) close(done)
} else if secondIndex {
t.Fatal("Didn't receive index updates for all existing files, missing", expected)
} }
close(done)
} }
// Make sure pulling doesn't interfere, as index updates are racy and // Make sure pulling doesn't interfere, as index updates are racy and
// thus we cannot distinguish between scan and pull results. // thus we cannot distinguish between scan and pull results.