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

Alerting: Fix flaky TestIntegrationUpdateAlertRules (#69106)

Browse Source 
Prevents duplicate alert rule ids and 0 value for BaseInterval and IntervalSeconds
This commit is contained in:
Matthew Jacobson
2023-05-25 16:00:06 -04:00
committed by GitHub
parent 014126a43e
commit 97ae6ae6ef
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/services/ngalert/store/alert_rule_test.go
View File

@@ -29,16 +29,17 @@ func TestIntegrationUpdateAlertRules(t *testing.T) {
t.Skip("skipping integration test") t.Skip("skipping integration test")
} }
cfg := setting.NewCfg() cfg := setting.NewCfg()
cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{BaseInterval: time.Duration(rand.Int63n(100)) * time.Second} cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{BaseInterval: time.Duration(rand.Int63n(100)+1) * time.Second}
sqlStore := db.InitTestDB(t) sqlStore := db.InitTestDB(t)
store := &DBstore{ store := &DBstore{
SQLStore: sqlStore, SQLStore: sqlStore,
Cfg: cfg.UnifiedAlerting, Cfg: cfg.UnifiedAlerting,
FolderService: setupFolderService(t, sqlStore, cfg), FolderService: setupFolderService(t, sqlStore, cfg),
} }
generator := models.AlertRuleGen(withIntervalMatching(store.Cfg.BaseInterval), models.WithUniqueID())
t.Run("should increase version", func(t *testing.T) { t.Run("should increase version", func(t *testing.T) {
rule := createRule(t, store, nil) rule := createRule(t, store, generator)
newRule := models.CopyRule(rule) newRule := models.CopyRule(rule)
newRule.Title = util.GenerateShortUID() newRule.Title = util.GenerateShortUID()
err := store.UpdateAlertRules(context.Background(), []models.UpdateRule{{ err := store.UpdateAlertRules(context.Background(), []models.UpdateRule{{
@@ -60,7 +61,7 @@ func TestIntegrationUpdateAlertRules(t *testing.T) {
}) })
t.Run("should fail due to optimistic locking if version does not match", func(t *testing.T) { t.Run("should fail due to optimistic locking if version does not match", func(t *testing.T) {
rule := createRule(t, store, nil) rule := createRule(t, store, generator)
rule.Version-- // simulate version discrepancy rule.Version-- // simulate version discrepancy
newRule := models.CopyRule(rule) newRule := models.CopyRule(rule)
@@ -168,7 +169,7 @@ func TestIntegration_GetAlertRulesForScheduling(t *testing.T) {
func withIntervalMatching(baseInterval time.Duration) func(*models.AlertRule) { func withIntervalMatching(baseInterval time.Duration) func(*models.AlertRule) {
return func(rule *models.AlertRule) { return func(rule *models.AlertRule) {
rule.IntervalSeconds = int64(baseInterval.Seconds()) * rand.Int63n(10) rule.IntervalSeconds = int64(baseInterval.Seconds()) * (rand.Int63n(10) + 1)
rule.For = time.Duration(rule.IntervalSeconds*rand.Int63n(9)+1) * time.Second rule.For = time.Duration(rule.IntervalSeconds*rand.Int63n(9)+1) * time.Second
} }
} }