From 1f3442020b671cd50ce582373b2dbea392d80a83 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Fri, 16 Feb 2018 14:31:03 +0100
Subject: [PATCH] alerts: refactoring tests

---
 pkg/services/sqlstore/alert_test.go | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkg/services/sqlstore/alert_test.go b/pkg/services/sqlstore/alert_test.go
index 361366578ab..f3050256aa8 100644
--- a/pkg/services/sqlstore/alert_test.go
+++ b/pkg/services/sqlstore/alert_test.go
@@ -67,8 +67,7 @@ func TestAlertingDataAccess(t *testing.T) {
 				So(err, ShouldBeNil)
 			})
 
-			alert, err := getAlertById(1)
-			So(err, ShouldBeNil)
+			alert, _ := getAlertById(1)
 			stateDateBeforePause := alert.NewStateDate
 
 			Convey("can pause all alerts", func() {
@@ -237,14 +236,6 @@ func TestAlertingDataAccess(t *testing.T) {
 		})
 	})
 }
-func pauseAllAlerts(pauseState bool) error {
-	cmd := &m.PauseAllAlertCommand{
-		Paused: pauseState,
-	}
-	err := PauseAllAlerts(cmd)
-	So(err, ShouldBeNil)
-	return err
-}
 
 func TestPausingAlerts(t *testing.T) {
 	mockTimeNow()
@@ -262,8 +253,7 @@ func TestPausingAlerts(t *testing.T) {
 			pauseAlert(testDash.OrgId, 1, true)
 
 			Convey("the NewStateDate should be updated", func() {
-				alert, err := getAlertById(1)
-				So(err, ShouldBeNil)
+				alert, _ := getAlertById(1)
 
 				stateDateAfterPause = alert.NewStateDate
 				So(stateDateBeforePause, ShouldHappenBefore, stateDateAfterPause)
@@ -274,8 +264,7 @@ func TestPausingAlerts(t *testing.T) {
 			pauseAlert(testDash.OrgId, 1, false)
 
 			Convey("the NewStateDate should be updated again", func() {
-				alert, err := getAlertById(1)
-				So(err, ShouldBeNil)
+				alert, _ := getAlertById(1)
 
 				stateDateAfterUnpause := alert.NewStateDate
 				So(stateDateAfterPause, ShouldHappenBefore, stateDateAfterUnpause)
@@ -325,3 +314,12 @@ func getAlertById(id int64) (*m.Alert, error) {
 	So(err, ShouldBeNil)
 	return q.Result, err
 }
+
+func pauseAllAlerts(pauseState bool) error {
+	cmd := &m.PauseAllAlertCommand{
+		Paused: pauseState,
+	}
+	err := PauseAllAlerts(cmd)
+	So(err, ShouldBeNil)
+	return err
+}