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

test, lib/rc: Integration test fixes and polish (#5488)

This commit is contained in:
Simon Frei 2019-01-29 16:59:01 +01:00 committed by Jakob Borg
parent 8815ef922b
commit 657be162dd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rc/rc.go
View File

@ -126,12 +126,10 @@ func (p *Process) wait() {
// AwaitStartup waits for the Syncthing process to start and perform initial
// scans of all folders.
func (p *Process) AwaitStartup() {
fmt.Println("awaiting startup")
select {
case <-p.startComplete:
case <-p.stopped:
}
fmt.Println("awaited startup")
}
// Stop stops the running Syncthing process. If the process was logging to a
@ -320,6 +318,7 @@ func InSync(folder string, ps ...*Process) bool {
// If our latest FolderSummary didn't report 100%, then we are not done.
if !ps[i].done[folder] {
l.Debugf("done = ps[%d].done[%q] = false", i, folder)
return false
}

4
test/override_test.go
View File

@ -28,8 +28,8 @@ func TestOverride(t *testing.T) {
fld := cfg.Folders()["default"]
fld.Type = config.FolderTypeSendOnly
cfg.SetFolder(fld)
t.Log(os.Rename("h1/config.xml", "h1/config.xml.orig"))
defer t.Log(os.Rename("h1/config.xml.orig", "h1/config.xml"))
os.Rename("h1/config.xml", "h1/config.xml.orig")
defer os.Rename("h1/config.xml.orig", "h1/config.xml")
cfg.Save()
log.Println("Cleaning...")