From ba7c1a6502c74b37282997b03a789c30051e97bf Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 30 Apr 2019 10:32:49 +0200 Subject: [PATCH] Call cancel on defer --- metricbeat/mb/testing/modules.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/mb/testing/modules.go b/metricbeat/mb/testing/modules.go index 6e9ef0aab12a..f48416e194b3 100644 --- a/metricbeat/mb/testing/modules.go +++ b/metricbeat/mb/testing/modules.go @@ -431,6 +431,8 @@ func RunPushMetricSetV2(timeout time.Duration, waitEvents int, metricSet mb.Push // time and returns all of the events that occur during that period. func RunPushMetricSetV2WithContext(timeout time.Duration, waitEvents int, metricSet mb.PushMetricSetV2WithContext) []mb.Event { ctx, cancel := context.WithTimeout(context.Background(), timeout) + defer cancel() + r := &capturingPushReporterV2{eventsC: make(chan mb.Event)} go metricSet.Run(ctx, r) @@ -444,10 +446,8 @@ func RunPushMetricSetV2WithContext(timeout time.Duration, waitEvents int, metric case e := <-r.eventsC: events = append(events, e) if len(events) >= waitEvents { - cancel() return events } } } - return events }