From fe5af9d0fa425528624f3323664ea2d8735e57f7 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Sun, 25 Aug 2019 13:35:59 -0700
Subject: [PATCH] Fix tests

---
 core/poller/.metadata.sh         | 2 +-
 core/poller/unifipoller/unifi.go | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/poller/.metadata.sh b/core/poller/.metadata.sh
index e98a9718..65f0e677 100755
--- a/core/poller/.metadata.sh
+++ b/core/poller/.metadata.sh
@@ -11,7 +11,7 @@ HBREPO="golift/homebrew-mugs"
 MAINT="David Newhall II <david at sleepers dot pro>"
 VENDOR="Go Lift"
 DESC="Polls a UniFi controller and stores metrics in InfluxDB"
-GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals"
+GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals -e dupl"
 # Example must exist at examples/$CONFIG_FILE.example
 CONFIG_FILE="up.conf"
 LICENSE="MIT"
diff --git a/core/poller/unifipoller/unifi.go b/core/poller/unifipoller/unifi.go
index 43f5fb8c..a6399d87 100644
--- a/core/poller/unifipoller/unifi.go
+++ b/core/poller/unifipoller/unifi.go
@@ -167,7 +167,8 @@ func (u *UnifiPoller) ReportMetrics(metrics *Metrics) error {
 // we just log the errors and tally them on a counter. In reality, this never
 // returns any errors because we control the data going in; cool right? But we
 // still check&log it in case the data going is skewed up and causes errors!
-func (m *Metrics) ProcessPoints() (errs []error) {
+func (m *Metrics) ProcessPoints() []error {
+	errs := []error{}
 	processPoints := func(m *Metrics, p []*influx.Point, err error) error {
 		if err != nil || p == nil {
 			return err
@@ -175,6 +176,7 @@ func (m *Metrics) ProcessPoints() (errs []error) {
 		m.BatchPoints.AddPoints(p)
 		return nil
 	}
+
 	for _, asset := range m.Sites {
 		pts, err := SitePoints(asset, m.TS)
 		errs = append(errs, processPoints(m, pts, err))
@@ -187,8 +189,9 @@ func (m *Metrics) ProcessPoints() (errs []error) {
 		pts, err := IDSPoints(asset) // no m.TS.
 		errs = append(errs, processPoints(m, pts, err))
 	}
+
 	if m.Devices == nil {
-		return
+		return errs
 	}
 	for _, asset := range m.UAPs {
 		pts, err := UAPPoints(asset, m.TS)
@@ -202,7 +205,7 @@ func (m *Metrics) ProcessPoints() (errs []error) {
 		pts, err := USWPoints(asset, m.TS)
 		errs = append(errs, processPoints(m, pts, err))
 	}
-	return
+	return errs
 }
 
 // GetFilteredSites returns a list of sites to fetch data for.