mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3587 from krasi-georgiev/web-test-error-check

Browse source 
handle web_test webhandler errors.
This commit is contained in:
Goutham Veeramachaneni 2018-01-10 22:03:25 +05:30 committed by GitHub
parent f64014f70b c94fa731aa
commit 35a6ffbaf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/prometheus/main_test.go
View file

@ -35,6 +35,9 @@ func TestMain(m *testing.M) {
if testing.Short() {
os.Exit(m.Run())
}
// On linux with a global proxy the tests will fail as the go client(http,grpc) tries to connect through the proxy.
os.Setenv("no_proxy", "localhost,127.0.0.1,0.0.0.0,:")
var err error
promPath, err = os.Getwd()
if err != nil {
@ -75,25 +78,20 @@ func TestStartupInterrupt(t *testing.T) {
}()
var startedOk bool
var stoppedOk bool
var stoppedErr error
Loop:
for x := 0; x < 10; x++ {
// error=nil means prometheus has started so can send the interrupt signal and wait for the grace shutdown.
if _, err := http.Get("http://localhost:9090/graph"); err == nil {
startedOk = true
prom.Process.Signal(os.Interrupt)
select {
case stoppedErr = <-done:
stoppedOk = true
break Loop
case <-time.After(10 * time.Second):
}
break Loop
}
time.Sleep(500 * time.Millisecond)
}
@ -102,10 +100,10 @@ Loop:
t.Errorf("prometheus didn't start in the specified timeout")
return
}
if err := prom.Process.Kill(); err == nil && !stoppedOk {
if err := prom.Process.Kill(); err == nil {
t.Errorf("prometheus didn't shutdown gracefully after sending the Interrupt signal")
} else if stoppedErr != nil {
t.Errorf("prometheus exited with an error:%v", stoppedErr)
} else if stoppedErr != nil && stoppedErr.Error() != "signal: interrupt" { // TODO - find a better way to detect when the process didn't exit as expected!
t.Errorf("prometheus exited with an unexpected error:%v", stoppedErr)
}
}

15
web/web_test.go
View file

@ -15,7 +15,6 @@ package web
import (
"context"
"fmt"
"io/ioutil"
"net/http"
"net/http/httptest"
@ -30,6 +29,11 @@ import (
libtsdb "github.com/prometheus/tsdb"
)
func TestMain(m *testing.M) {
// On linux with a global proxy the tests will fail as the go client(http,grpc) tries to connect through the proxy.
os.Setenv("no_proxy", "localhost,127.0.0.1,0.0.0.0,:")
os.Exit(m.Run())
}
func TestGlobalURL(t *testing.T) {
opts := &Options{
ListenAddress: ":9090",
@ -108,7 +112,12 @@ func TestReadyAndHealthy(t *testing.T) {
opts.Flags = map[string]string{}
webHandler := New(nil, opts)
go webHandler.Run(context.Background())
go func() {
err := webHandler.Run(context.Background())
if err != nil {
t.Fatalf("Can't start web handler:%s", err)
}
}()
// Give some time for the web goroutine to run since we need the server
// to be up before starting tests.
@ -202,7 +211,7 @@ func TestRoutePrefix(t *testing.T) {
go func() {
err := webHandler.Run(context.Background())
if err != nil {
panic(fmt.Sprintf("Can't start webhandler error %s", err))
t.Fatalf("Can't start web handler:%s", err)
}
}()