octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 10:58:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Update conflict integration test (ref #5511) (#5618)

Browse Source 
The change in 225c0dda80 (#5511) results in
conflicts being immediately scanned and synced, while the test expects just one
conflict on either side. Change it to expect the same conflict on both sides.
This commit is contained in:
Simon Frei 2019-03-25 12:53:06 +01:00 committed by Jakob Borg
parent e31a116e6e
commit bc53782f88
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/conflict_test.go
View File

@ -133,8 +133,10 @@ func TestConflictsDefault(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if len(files) != 1 { if len(files) != 2 {
t.Errorf("Expected 1 conflicted files instead of %d", len(files)) t.Errorf("Expected 1 conflicted file on each side, instead of totally %d", len(files))
} else if filepath.Base(files[0]) != filepath.Base(files[1]) {
t.Errorf(`Expected same conflicted file on both sides, got "%v" and "%v"`, files[0], files[1])
} }
log.Println("Introducing a conflict (edit plus delete)...") log.Println("Introducing a conflict (edit plus delete)...")