From 8105ec4660f07d355395891f52e486bf0f4b89b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 7 Jun 2016 14:27:56 +0200
Subject: [PATCH] feat(alerting): fixed test issues

---
 pkg/services/alerting/engine.go                  | 1 -
 pkg/services/alerting/executor.go                | 2 +-
 pkg/services/sqlstore/alert_rule_changes_test.go | 3 +--
 pkg/services/sqlstore/sqlstore.go                | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index 73e368c0b88..8fad275944f 100644
--- a/pkg/services/alerting/engine.go
+++ b/pkg/services/alerting/engine.go
@@ -89,7 +89,6 @@ func (e *Engine) executeJob(job *AlertJob) {
 			AlertJob: job,
 		}
 		e.log.Debug("Job Execution timeout", "alertRuleId", job.Rule.Id)
-
 	case result := <-resultChan:
 		result.Duration = float64(time.Since(now).Nanoseconds()) / float64(1000000)
 		e.log.Debug("Job Execution done", "timeTakenMs", result.Duration, "ruleId", job.Rule.Id)
diff --git a/pkg/services/alerting/executor.go b/pkg/services/alerting/executor.go
index 06b14e29d5b..642e93442a3 100644
--- a/pkg/services/alerting/executor.go
+++ b/pkg/services/alerting/executor.go
@@ -137,7 +137,7 @@ func (e *ExecutorImpl) GetRequestForAlertRule(rule *AlertRule, datasource *m.Dat
 			To:   "now",
 		},
 		Queries: tsdb.QuerySlice{
-			&tsdb.Query{
+			{
 				RefId: rule.QueryRefId,
 				Query: rule.Query,
 				DataSource: &tsdb.DataSourceInfo{
diff --git a/pkg/services/sqlstore/alert_rule_changes_test.go b/pkg/services/sqlstore/alert_rule_changes_test.go
index dff2b7853b1..65343979708 100644
--- a/pkg/services/sqlstore/alert_rule_changes_test.go
+++ b/pkg/services/sqlstore/alert_rule_changes_test.go
@@ -21,7 +21,7 @@ func TestAlertRuleChangesDataAccess(t *testing.T) {
 
 		Convey("When dashboard is removed", func() {
 			items := []*m.AlertRule{
-				&m.AlertRule{
+				{
 					PanelId:      1,
 					DashboardId:  testDash.Id,
 					Query:        "Query",
@@ -48,7 +48,6 @@ func TestAlertRuleChangesDataAccess(t *testing.T) {
 
 			SaveAlerts(&cmd)
 
-			query := &m.GetAlertChangesQuery{OrgId: FakeOrgId}
 			er := GetAlertRuleChanges(query)
 			So(er, ShouldBeNil)
 			So(len(query.Result), ShouldEqual, 1)
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 30f194d6938..81b19717ddf 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -81,7 +81,7 @@ func NewEngine() {
 	err = SetEngine(x, setting.Env == setting.DEV)
 
 	if err != nil {
-		sqlog.Error("Fail to initialize orm engine: %v", err)
+		sqlog.Error("Fail to initialize orm engine", "error", err)
 		os.Exit(1)
 	}
 }