From c266ddb2fc3010138acd62b769ccd4a042593c00 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 13 Mar 2020 16:37:28 +0100 Subject: [PATCH] Increase HTTP client timeout in kubernetes state_deployment tests Test data for state_deployment metricset is quite big, and the metricset may need more than the 10 seconds default timeout of HTTP clients, provoking sporadic failures in CI. Increase this timeout for this case. --- metricbeat/mb/testing/testdata.go | 6 +++++- .../kubernetes/state_deployment/_meta/testdata/config.yml | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go index 39ff777beefd..ca1005e57c37 100644 --- a/metricbeat/mb/testing/testdata.go +++ b/metricbeat/mb/testing/testdata.go @@ -278,7 +278,11 @@ func runTest(t *testing.T, file string, module, metricSetName string, config Dat for _, e := range expectedMap { t.Error(e) } - t.Fatal() + } + + // If there was some error, fail before trying to write anything. + if t.Failed() { + t.FailNow() } if strings.HasSuffix(file, "docs."+config.Suffix) { diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml index ab6bf2416543..6fc3bdf4271c 100644 --- a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml +++ b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml @@ -1,3 +1,5 @@ type: http url: "/metrics" suffix: plain +module: + timeout: 30s