lib/model: Fix flaky test and add some scanning debug (#7214)

2020-12-20 18:13:35 +01:00
parent fa40ccece1
commit d904dfa191
2 changed files with 11 additions and 2 deletions
@@ -393,9 +393,13 @@ func TestRecvOnlyRemoteUndoChanges(t *testing.T) {
 		return true
 	})
 	snap.Release()
-	m.Index(device1, "ro", files)
+	m.IndexUpdate(device1, "ro", files)

-	must(t, m.ScanFolder("ro"))
+	// Ensure the pull to resolve conflicts (content identical) happened
+	must(t, f.doInSync(func() error {
+		f.pull()
+		return nil
+	}))

 	size = receiveOnlyChangedSize(t, m, "ro")
 	if size.Files+size.Directories+size.Deleted != 0 {