felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib: Skip deleted, locally changed on recv-enc folders (fixes #7153) (#7154)

Browse Source
This commit is contained in:
Simon Frei
2020-11-27 11:26:36 +01:00
committed by GitHub
parent af13f0cd35
commit a9764fc16c
5 changed files with 127 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/requests_test.go
+6 -3
View File
@@ -1002,14 +1002,16 @@ func TestNeedFolderFiles(t *testing.T) {
t.Fatal("Timed out before receiving index")
}
progress, queued, rest := m.NeedFolderFiles(fcfg.ID, 1, 100)
progress, queued, rest, err := m.NeedFolderFiles(fcfg.ID, 1, 100)
must(t, err)
if got := len(progress) + len(queued) + len(rest); got != num {
t.Errorf("Got %v needed items, expected %v", got, num)
}
exp := 10
for page := 1; page < 3; page++ {
progress, queued, rest := m.NeedFolderFiles(fcfg.ID, page, exp)
progress, queued, rest, err := m.NeedFolderFiles(fcfg.ID, page, exp)
must(t, err)
if got := len(progress) + len(queued) + len(rest); got != exp {
t.Errorf("Got %v needed items on page %v, expected %v", got, page, exp)
}
@@ -1128,7 +1130,8 @@ func TestRequestLastFileProgress(t *testing.T) {
fc.mut.Lock()
fc.requestFn = func(_ context.Context, folder, name string, _ int64, _ int, _ []byte, _ bool) ([]byte, error) {
defer close(done)
progress, queued, rest := m.NeedFolderFiles(folder, 1, 10)
progress, queued, rest, err := m.NeedFolderFiles(folder, 1, 10)
must(t, err)
if len(queued)+len(rest) != 0 {
t.Error(`There should not be any queued or "rest" items`)
}