status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-25 21:19:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8453 from hashicorp/dnephin/fix-test-server-timeout

Browse Source 
sdk: mitigate api test timeout
This commit is contained in:
Daniel Nephin 2020-08-11 16:48:29 -04:00 committed by GitHub
commit 36202a12dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sdk/testutil/server.go
View File

@ -25,6 +25,7 @@ import (
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
"syscall"
"testing" "testing"
"time" "time"
@ -328,9 +329,22 @@ func (s *TestServer) Stop() error {
} }
} }
waitDone := make(chan error)
go func() {
waitDone <- s.cmd.Wait()
close(waitDone)
}()
// wait for the process to exit to be sure that the data dir can be // wait for the process to exit to be sure that the data dir can be
// deleted on all platforms. // deleted on all platforms.
return s.cmd.Wait() select {
case err := <-waitDone:
return err
case <-time.After(10 * time.Second):
s.cmd.Process.Signal(syscall.SIGABRT)
s.cmd.Wait()
return fmt.Errorf("timeout waiting for server to stop gracefully")
}
} }
// waitForAPI waits for the /status/leader HTTP endpoint to start // waitForAPI waits for the /status/leader HTTP endpoint to start
@ -351,11 +365,12 @@ func (s *TestServer) waitForAPI() error {
time.Sleep(timer.Wait) time.Sleep(timer.Wait)
url := s.url("/v1/status/leader") url := s.url("/v1/status/leader")
_, err := s.masterGet(url) resp, err := s.masterGet(url)
if err != nil { if err != nil {
failed = true failed = true
continue continue
} }
resp.Body.Close()
failed = false failed = false
} }