From 165417c46235b0b1787599980532dd8d23e01390 Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Sun, 19 Aug 2018 23:34:26 +0200
Subject: [PATCH] lib/model: Fixes on receive-only test setup and pulling
 (#5136)

---
 lib/model/folder_recvonly_test.go | 5 +++++
 lib/model/folder_sendrecv.go      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lib/model/folder_recvonly_test.go b/lib/model/folder_recvonly_test.go
index 08ff4b059..bbfa496bf 100644
--- a/lib/model/folder_recvonly_test.go
+++ b/lib/model/folder_recvonly_test.go
@@ -7,6 +7,8 @@
 package model
 
 import (
+	"bytes"
+	"context"
 	"io/ioutil"
 	"os"
 	"testing"
@@ -16,6 +18,7 @@ import (
 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/scanner"
 )
 
 func TestRecvOnlyRevertDeletes(t *testing.T) {
@@ -244,6 +247,7 @@ func setupKnownFiles(t *testing.T, data []byte) []protocol.FileInfo {
 	if err != nil {
 		t.Fatal(err)
 	}
+	blocks, _ := scanner.Blocks(context.TODO(), bytes.NewReader(data), protocol.BlockSize(int64(len(data))), int64(len(data)), nil, true)
 	knownFiles := []protocol.FileInfo{
 		{
 			Name:        "knownDir",
@@ -261,6 +265,7 @@ func setupKnownFiles(t *testing.T, data []byte) []protocol.FileInfo {
 			ModifiedNs:  int32(fi.ModTime().UnixNano() % 1e9),
 			Version:     protocol.Vector{Counters: []protocol.Counter{{ID: 42, Value: 42}}},
 			Sequence:    42,
+			Blocks:      blocks,
 		},
 	}
 
diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go
index cea545f80..9fd530f18 100644
--- a/lib/model/folder_sendrecv.go
+++ b/lib/model/folder_sendrecv.go
@@ -455,6 +455,7 @@ nextFile:
 		}
 
 		if !f.checkParent(fi.Name, scanChan) {
+			f.queue.Done(fileName)
 			continue
 		}