homelab/traefik
1
0
Fork 0
Code Activity

test: use MustNewRequest.

Browse source
This commit is contained in:
Fernandez Ludovic 2017-06-03 14:58:35 +02:00 • committed by Ludovic Fernandez
parent 2223587fc0
commit a1a0420314
7 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
middlewares/prometheus_test.go
View file

@ -2,7 +2,6 @@ package middlewares
import (
"fmt"
"io"
"io/ioutil"
"net/http"
"net/http/httptest"
@ -10,6 +9,7 @@ import (
"testing"
"github.com/codegangsta/negroni"
"github.com/containous/traefik/testhelpers"
"github.com/containous/traefik/types"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
@ -28,8 +28,8 @@ func TestPrometheus(t *testing.T) {
recorder := httptest.NewRecorder()
req1 := mustNewRequest("GET", "http://localhost:3000/ok", ioutil.NopCloser(nil))
req2 := mustNewRequest("GET", "http://localhost:3000/metrics", ioutil.NopCloser(nil))
req1 := testhelpers.MustNewRequest(http.MethodGet, "http://localhost:3000/ok", ioutil.NopCloser(nil))
req2 := testhelpers.MustNewRequest(http.MethodGet, "http://localhost:3000/metrics", ioutil.NopCloser(nil))
httpHandler := setupTestHTTPHandler()
httpHandler.ServeHTTP(recorder, req1)
@ -60,7 +60,7 @@ func TestPrometheus(t *testing.T) {
name: reqsTotalName,
labels: map[string]string{
"code": "200",
"method": "GET",
"method": http.MethodGet,
"service": "test",
},
assert: func(family *dto.MetricFamily) {
@ -99,7 +99,7 @@ func TestPrometheus(t *testing.T) {
},
}
assert.Equal(t, len(tests), len(metricsFamilies)-initialMetricsFamilyCount, "gathered traefic metrics count does not match tests count")
assert.Equal(t, len(tests), len(metricsFamilies)-initialMetricsFamilyCount, "gathered Traefik metrics count does not match tests count")
for _, test := range tests {
family := findMetricFamily(test.name, metricsFamilies)
@ -123,7 +123,7 @@ func TestPrometheusRegisterMetricsMultipleTimes(t *testing.T) {
defer resetPrometheusValues()
recorder := httptest.NewRecorder()
req1 := mustNewRequest("GET", "http://localhost:3000/ok", ioutil.NopCloser(nil))
req1 := testhelpers.MustNewRequest(http.MethodGet, "http://localhost:3000/ok", ioutil.NopCloser(nil))
httpHandler := setupTestHTTPHandler()
httpHandler.ServeHTTP(recorder, req1)
@ -162,15 +162,6 @@ func setupTestHTTPHandler() http.Handler {
return n
}
// mustNewRequest is like http.NewRequest but panics if an error occurs.
func mustNewRequest(method, urlStr string, body io.Reader) *http.Request {
req, err := http.NewRequest(method, urlStr, body)
if err != nil {
panic(fmt.Sprintf("NewRequest(%s, %s, %+v): %s", method, urlStr, body, err))
}
return req
}
func resetPrometheusValues() {
_, collectors := newPrometheusMetrics()