Simplify HTTP testing

This commit is contained in:
Jakob Borg
2014-10-06 12:03:49 +02:00
parent 590afebc0a
commit d476c2b613
8 changed files with 260 additions and 435 deletions

View File

@@ -62,11 +62,11 @@ type syncthingProcess struct {
logfd *os.File
}
func (p *syncthingProcess) start() (string, error) {
func (p *syncthingProcess) start() error {
if p.logfd == nil {
logfd, err := os.Create(p.log)
if err != nil {
return "", err
return err
}
p.logfd = logfd
}
@@ -78,14 +78,15 @@ func (p *syncthingProcess) start() (string, error) {
err := cmd.Start()
if err != nil {
return "", err
return err
}
p.cmd = cmd
for {
ver, err := p.version()
resp, err := p.get("/")
if err == nil {
return ver, nil
resp.Body.Close()
return nil
}
time.Sleep(250 * time.Millisecond)
}