public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: avoid hard-coding IDs in integration tests (#33152)

Browse Source 
* use dynamic user Ids in test

* use dynamic IDs in alert tests

* use dynamic IDs in dashboard test queries

* use dynamic IDs in org test queries
This commit is contained in:
Dafydd
2021-04-21 11:22:46 +03:00
committed by GitHub
parent 2cd6c0565b
commit 0dcd0281ab
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/alert_test.go
+26 -11
View File
@@ -62,9 +62,17 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("Can set new states", func() {
// Get alert so we can use its ID in tests
alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: &models.SignedInUser{OrgRole: models.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&alertQuery)
So(err2, ShouldBeNil)
insertedAlert := alertQuery.Result[0]
Convey("new state ok", func() {
cmd := &models.SetAlertStateCommand{
AlertId: 1,
AlertId: insertedAlert.Id,
State: models.AlertStateOK,
}
@@ -72,7 +80,7 @@ func TestAlertingDataAccess(t *testing.T) {
So(err, ShouldBeNil)
})
alert, _ := getAlertById(1)
alert, _ := getAlertById(insertedAlert.Id)
stateDateBeforePause := alert.NewStateDate
Convey("can pause all alerts", func() {
@@ -81,7 +89,7 @@ func TestAlertingDataAccess(t *testing.T) {
Convey("cannot updated paused alert", func() {
cmd := &models.SetAlertStateCommand{
AlertId: 1,
AlertId: insertedAlert.Id,
State: models.AlertStateOK,
}
@@ -90,13 +98,13 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("alert is paused", func() {
alert, _ = getAlertById(1)
alert, _ = getAlertById(insertedAlert.Id)
currentState := alert.State
So(currentState, ShouldEqual, "paused")
})
Convey("pausing alerts should update their NewStateDate", func() {
alert, _ = getAlertById(1)
alert, _ = getAlertById(insertedAlert.Id)
stateDateAfterPause := alert.NewStateDate
So(stateDateBeforePause, ShouldHappenBefore, stateDateAfterPause)
})
@@ -104,7 +112,7 @@ func TestAlertingDataAccess(t *testing.T) {
Convey("unpausing alerts should update their NewStateDate again", func() {
err := pauseAllAlerts(false)
So(err, ShouldBeNil)
alert, _ = getAlertById(1)
alert, _ = getAlertById(insertedAlert.Id)
stateDateAfterUnpause := alert.NewStateDate
So(stateDateBeforePause, ShouldHappenBefore, stateDateAfterUnpause)
})
@@ -259,7 +267,6 @@ func TestAlertingDataAccess(t *testing.T) {
query := models.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, OrgId: 1, User: &models.SignedInUser{OrgRole: models.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&query)
So(testDash.Id, ShouldEqual, 1)
So(err2, ShouldBeNil)
So(len(query.Result), ShouldEqual, 0)
})
@@ -280,12 +287,20 @@ func TestPausingAlerts(t *testing.T) {
stateDateBeforePause := alert.NewStateDate
stateDateAfterPause := stateDateBeforePause
// Get alert so we can use its ID in tests
alertQuery := models.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: &models.SignedInUser{OrgRole: models.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&alertQuery)
So(err2, ShouldBeNil)
insertedAlert := alertQuery.Result[0]
Convey("when paused", func() {
_, err := pauseAlert(testDash.OrgId, 1, true)
_, err := pauseAlert(testDash.OrgId, insertedAlert.Id, true)
So(err, ShouldBeNil)
Convey("the NewStateDate should be updated", func() {
alert, err := getAlertById(1)
alert, err := getAlertById(insertedAlert.Id)
So(err, ShouldBeNil)
stateDateAfterPause = alert.NewStateDate
@@ -294,11 +309,11 @@ func TestPausingAlerts(t *testing.T) {
})
Convey("when unpaused", func() {
_, err := pauseAlert(testDash.OrgId, 1, false)
_, err := pauseAlert(testDash.OrgId, insertedAlert.Id, false)
So(err, ShouldBeNil)
Convey("the NewStateDate should be updated again", func() {
alert, err := getAlertById(1)
alert, err := getAlertById(insertedAlert.Id)
So(err, ShouldBeNil)
stateDateAfterUnpause := alert.NewStateDate