Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Debug and test fixes (#5613)

This commit is contained in:
Simon Frei 2019-03-22 14:43:47 +01:00 committed by Jakob Borg
parent 73fa7a6e5b
commit e7ae851900
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/model/model.go
View File

@ -1940,15 +1940,6 @@ func sendIndexTo(prevSequence int64, conn protocol.Connection, folder string, fs
}
}
if shouldDebug() {
if fi.SequenceNo() < prevSequence+1 {
panic(fmt.Sprintln("sequence lower than requested, got:", fi.SequenceNo(), ", asked to start at:", prevSequence+1))
}
if f.Sequence > 0 && fi.SequenceNo() <= f.Sequence {
panic(fmt.Sprintln("non-increasing sequence, current:", fi.SequenceNo(), "<= previous:", f.Sequence))
}
}
f = fi.(protocol.FileInfo)
// Mark the file as invalid if any of the local bad stuff flags are set.

8
lib/model/requests_test.go
View File

@ -370,14 +370,12 @@ func pullInvalidIgnored(t *testing.T, ft config.FolderType) {
fc.sendIndexUpdate()
timeout := time.NewTimer(5 * time.Second)
select {
case ev := <-sub.C():
t.Fatalf("Errors while pulling: %v", ev)
case <-timeout.C:
case <-time.After(5 * time.Second):
t.Fatalf("timed out before index was received")
case <-done:
return
}
fc.mut.Lock()
@ -421,12 +419,10 @@ func pullInvalidIgnored(t *testing.T, ft config.FolderType) {
panic(err)
}
timeout = time.NewTimer(5 * time.Second)
select {
case <-timeout.C:
case <-time.After(5 * time.Second):
t.Fatalf("timed out before index was received")
case <-done:
return
}
}