From 502d9ab4997190ce770107c9b945776cf75f345c Mon Sep 17 00:00:00 2001 From: kostya-sh Date: Thu, 11 Oct 2018 20:15:17 +0100 Subject: [PATCH] Fix TestGatheringTimeout test for dns_query plugin (#4842) --- plugins/inputs/dns_query/dns_query_test.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/inputs/dns_query/dns_query_test.go b/plugins/inputs/dns_query/dns_query_test.go index 3f70153e4..5a1379764 100644 --- a/plugins/inputs/dns_query/dns_query_test.go +++ b/plugins/inputs/dns_query/dns_query_test.go @@ -117,21 +117,17 @@ func TestGatheringTimeout(t *testing.T) { var acc testutil.Accumulator dnsConfig.Port = 60054 dnsConfig.Timeout = 1 - var err error channel := make(chan error, 1) go func() { channel <- acc.GatherError(dnsConfig.Gather) }() select { - case res := <-channel: - err = res + case err := <-channel: + assert.NoError(t, err) case <-time.After(time.Second * 2): - err = nil + assert.Fail(t, "DNS query did not timeout") } - - assert.Error(t, err) - assert.Contains(t, err.Error(), "i/o timeout") } func TestSettingDefaultValues(t *testing.T) {