From f4ebf9f77d92c1199fa20c0530ebdb2ceab45436 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 7 May 2019 15:40:50 -0700
Subject: [PATCH] Backport test functions

---
 testutil/accumulator.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index a7b9fe8f..19acebe1 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -45,12 +45,22 @@ type Accumulator struct {
 	Errors    []error
 	debug     bool
 	delivered chan telegraf.DeliveryInfo
+
+	TimeFunc func() time.Time
 }
 
 func (a *Accumulator) NMetrics() uint64 {
 	return atomic.LoadUint64(&a.nMetrics)
 }
 
+func (a *Accumulator) GetTelegrafMetrics() []telegraf.Metric {
+	metrics := []telegraf.Metric{}
+	for _, m := range a.Metrics {
+		metrics = append(metrics, FromTestMetric(m))
+	}
+	return metrics
+}
+
 func (a *Accumulator) FirstError() error {
 	if len(a.Errors) == 0 {
 		return nil
@@ -101,6 +111,12 @@ func (a *Accumulator) AddFields(
 		t = timestamp[0]
 	} else {
 		t = time.Now()
+		if a.TimeFunc == nil {
+			t = time.Now()
+		} else {
+			t = a.TimeFunc()
+		}
+
 	}
 
 	if a.debug {