|
|
@ -25,6 +25,7 @@ import (
|
|
|
|
"runtime"
|
|
|
|
"runtime"
|
|
|
|
"strconv"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
"syscall"
|
|
|
|
"testing"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
|
|
|
@ -340,7 +341,7 @@ func (s *TestServer) Stop() error {
|
|
|
|
case err := <-waitDone:
|
|
|
|
case err := <-waitDone:
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
case <-time.After(10 * time.Second):
|
|
|
|
case <-time.After(10 * time.Second):
|
|
|
|
s.cmd.Process.Kill()
|
|
|
|
s.cmd.Process.Signal(syscall.SIGABRT)
|
|
|
|
s.cmd.Wait()
|
|
|
|
s.cmd.Wait()
|
|
|
|
return fmt.Errorf("timeout waiting for server to stop gracefully")
|
|
|
|
return fmt.Errorf("timeout waiting for server to stop gracefully")
|
|
|
|
}
|
|
|
|
}
|
|
|
|