IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

removes unnessecary db request

Browse Source
This commit is contained in:
bergquist 2019-01-28 15:37:52 +01:00
parent 935da14f7d
commit 21fff415ed
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/alerting/extractor_test.go
View File

@ -200,8 +200,6 @@ func TestAlertRuleExtraction(t *testing.T) {
Convey("Alert notifications are in DB", func() { Convey("Alert notifications are in DB", func() {
sqlstore.InitTestDB(t) sqlstore.InitTestDB(t)
err := sqlstore.CreateOrg(&m.CreateOrgCommand{Name: "Main Org."})
So(err, ShouldBeNil)
firstNotification := m.CreateAlertNotificationCommand{Uid: "notifier1", OrgId: 1, Name: "1"} firstNotification := m.CreateAlertNotificationCommand{Uid: "notifier1", OrgId: 1, Name: "1"}
err = sqlstore.CreateAlertNotificationCommand(&firstNotification) err = sqlstore.CreateAlertNotificationCommand(&firstNotification)
So(err, ShouldBeNil) So(err, ShouldBeNil)

5
pkg/services/alerting/rule_test.go
View File

@ -59,10 +59,8 @@ func TestAlertRuleModel(t *testing.T) {
}) })
Convey("can construct alert rule model", func() { Convey("can construct alert rule model", func() {
err := sqlstore.CreateOrg(&m.CreateOrgCommand{Name: "Main Org."})
So(err, ShouldBeNil)
firstNotification := m.CreateAlertNotificationCommand{OrgId: 1, Name: "1"} firstNotification := m.CreateAlertNotificationCommand{OrgId: 1, Name: "1"}
err = sqlstore.CreateAlertNotificationCommand(&firstNotification) err := sqlstore.CreateAlertNotificationCommand(&firstNotification)
So(err, ShouldBeNil) So(err, ShouldBeNil)
secondNotification := m.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"} secondNotification := m.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"}
err = sqlstore.CreateAlertNotificationCommand(&secondNotification) err = sqlstore.CreateAlertNotificationCommand(&secondNotification)
@ -182,6 +180,5 @@ func TestAlertRuleModel(t *testing.T) {
So(err, ShouldNotBeNil) So(err, ShouldNotBeNil)
So(err.Error(), ShouldEqual, "Alert validation error: Neither id nor uid is specified, type assertion to string failed AlertId: 1 PanelId: 1 DashboardId: 1") So(err.Error(), ShouldEqual, "Alert validation error: Neither id nor uid is specified, type assertion to string failed AlertId: 1 PanelId: 1 DashboardId: 1")
}) })
}) })
} }