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

Alerting: Fix flaky migration test (#48595)

Browse Source 
* Fix flaky migration test
This commit is contained in:
Matthew Jacobson 2022-05-18 13:23:13 -04:00 committed by GitHub
parent 7688b12f9a
commit 5c32a6b6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/services/sqlstore/migrations/ualert/migration_test.go
View File

@ -118,7 +118,6 @@ func TestAddDashAlertMigration(t *testing.T) {
// TestDashAlertMigration tests the execution of the main DashAlertMigration.
func TestDashAlertMigration(t *testing.T) {
t.Skip("Test is flaky")
// Run initial migration to have a working DB.
x := setupTestDB(t)
@ -444,7 +443,12 @@ func TestDashAlertMigration(t *testing.T) {
// Order of nested routes is not guaranteed.
cOpt = []cmp.Option{
cmpopts.SortSlices(func(a, b *ualert.Route) bool { return a.Receiver < b.Receiver }),
cmpopts.SortSlices(func(a, b *ualert.Route) bool {
if a.Receiver != b.Receiver {
return a.Receiver < b.Receiver
}
return a.Matchers[0].Value < b.Matchers[0].Value
}),
cmpopts.IgnoreUnexported(ualert.Route{}, labels.Matcher{}),
}
if !cmp.Equal(tt.expected[orgId].AlertmanagerConfig.Route, amConfig.AlertmanagerConfig.Route, cOpt...) {
@ -481,7 +485,6 @@ var (
)
// createAlertNotification creates a legacy alert notification channel for inserting into the test database.
//nolint
func createAlertNotification(t *testing.T, orgId int64, uid string, channelType string, settings string, defaultChannel bool) *models.AlertNotification {
t.Helper()
settingsJson := simplejson.New()
@ -508,7 +511,6 @@ func createAlertNotification(t *testing.T, orgId int64, uid string, channelType
}
// createAlert creates a legacy alert rule for inserting into the test database.
//nolint
func createAlert(t *testing.T, orgId int64, dashboardId int64, panelsId int64, name string, notifierUids []string) *models.Alert {
t.Helper()
@ -665,7 +667,6 @@ func boolPointer(b bool) *bool {
}
// createAlertNameMatchers creates a temporary alert_name Matchers that will be replaced during runtime with the generated rule_uid.
//nolint
func createAlertNameMatchers(alertName string) ualert.Matchers {
matcher, _ := labels.NewMatcher(labels.MatchEqual, "alert_name", alertName)
return ualert.Matchers(labels.Matchers{matcher})