瀏覽代碼

removes unnessecary db request

bergquist 7 年之前
父節點
當前提交
21fff415ed
共有 2 個文件被更改,包括 1 次插入6 次删除
  1. 0 2
      pkg/services/alerting/extractor_test.go
  2. 1 4
      pkg/services/alerting/rule_test.go

+ 0 - 2
pkg/services/alerting/extractor_test.go

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

+ 1 - 4
pkg/services/alerting/rule_test.go

@@ -59,10 +59,8 @@ func TestAlertRuleModel(t *testing.T) {
 		})
 
 		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"}
-			err = sqlstore.CreateAlertNotificationCommand(&firstNotification)
+			err := sqlstore.CreateAlertNotificationCommand(&firstNotification)
 			So(err, ShouldBeNil)
 			secondNotification := m.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"}
 			err = sqlstore.CreateAlertNotificationCommand(&secondNotification)
@@ -182,6 +180,5 @@ func TestAlertRuleModel(t *testing.T) {
 			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")
 		})
-
 	})
 }