X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d868844fae9f52455b2e1954382bf9e4bb66c22..288c739c3349dcf10ff7a77009e81a4330af2c8e:/services/keep-web/server_test.go diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go index a418e84d5a..0308f949f4 100644 --- a/services/keep-web/server_test.go +++ b/services/keep-web/server_test.go @@ -509,23 +509,21 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) { c.Check(resp.StatusCode, check.Equals, http.StatusNotFound) } - // Dump entire metrics output in test logs req, _ = http.NewRequest("GET", srvaddr+"/metrics", nil) req.Host = cluster.Services.WebDAVDownload.ExternalURL.Host req.Header.Set("Authorization", "Bearer "+arvadostest.ManagementToken) resp, err = http.DefaultClient.Do(req) c.Assert(err, check.IsNil) c.Check(resp.StatusCode, check.Equals, http.StatusOK) - buf, err := ioutil.ReadAll(resp.Body) + allmetrics, err := ioutil.ReadAll(resp.Body) c.Check(err, check.IsNil) - c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_download_limiting_backend_speed_bucket{size_range="0",le="1e\+06"} 4\n.*`) - c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_download_speed_bucket{size_range="0",le="\+Inf"} 4\n.*`) - c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_upload_speed_bucket{size_range="0",le="\+Inf"} 2\n.*`) - c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_upload_sync_delay_seconds_bucket{size_range="0",le="10"} 2\n.*`) + c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_apparent_backend_speed_bucket{size_range="0",le="\+Inf"} 4\n.*`) + c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_speed_bucket{size_range="0",le="\+Inf"} 4\n.*`) + c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_upload_speed_bucket{size_range="0",le="\+Inf"} 2\n.*`) + c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_upload_sync_delay_seconds_bucket{size_range="0",le="10"} 2\n.*`) - // Dump entire metrics output in test logs - c.Logf("%s", buf) + c.Logf("%s", allmetrics) } func (s *IntegrationSuite) SetUpSuite(c *check.C) {