Merge 7ff31ea into da86079

m-lab · Feb 19, 2019 · cbfc45c · cbfc45c
2 parents da86079 + 7ff31ea
commit cbfc45c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
@@ -2,6 +2,7 @@ package metrics_test
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -13,7 +14,7 @@ import (
 
 func TestPrometheusMetrics(t *testing.T) {
 	server := metrics.SetupPrometheus(0)
-	defer server.Shutdown(nil)
+	defer server.Shutdown(context.Background())
 	log.Println(server.Addr)
 
 	metricReader, err := http.Get("http://" + server.Addr + "/metrics")

diff --git a/travis b/travis