perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/db: Catch unignored/conflicting files as needed (fixes #5053) (#5054)

Browse Source
This commit is contained in:
Simon Frei
2018-07-10 17:32:34 +02:00
committed by Jakob Borg
parent e10d7260c2
commit 3f17bda786
3 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/db/set_test.go
View File

@@ -1065,6 +1065,36 @@ func TestNeedDeleted(t *testing.T) {
}
}
func TestNeedAfterUnignore(t *testing.T) {
ldb := db.OpenMemory()
folder := "test"
file := "foo"
s := db.NewFileSet(folder, fs.NewFilesystem(fs.FilesystemTypeBasic, "."), ldb)
remID := remoteDevice0.Short()
// Initial state: Devices in sync, locally ignored
local := protocol.FileInfo{Name: file, Version: protocol.Vector{Counters: []protocol.Counter{{ID: remID, Value: 1}, {ID: myID, Value: 1}}}, ModifiedS: 10}
local.SetIgnored(myID)
remote := protocol.FileInfo{Name: file, Version: protocol.Vector{Counters: []protocol.Counter{{ID: remID, Value: 1}, {ID: myID, Value: 1}}}, ModifiedS: 10}
s.Update(protocol.LocalDeviceID, fileList{local})
s.Update(remoteDevice0, fileList{remote})
// Unignore locally -> conflicting changes. Remote is newer, thus winning.
local.Version = local.Version.Update(myID)
local.Version = local.Version.DropOthers(myID)
local.LocalFlags = 0
local.ModifiedS = 0
s.Update(protocol.LocalDeviceID, fileList{local})
if need := needList(s, protocol.LocalDeviceID); len(need) != 1 {
t.Fatal("Expected one local need, got", need)
} else if !need[0].IsEquivalent(remote, false, false) {
t.Fatalf("Got %v, expected %v", need[0], remote)
}
}
func replace(fs *db.FileSet, device protocol.DeviceID, files []protocol.FileInfo) {
fs.Drop(device)
fs.Update(device, files)