From 23e05373a77fb184a00af8a61a8e4f8bff669064 Mon Sep 17 00:00:00 2001 From: Matthew Jacobson Date: Tue, 17 Jan 2023 14:09:46 -0500 Subject: [PATCH] Alerting: Fix flaky TestIntegrationUpdateAlertRules (#61641) Prevents random OrgID=0 in test alert generation causing invalid alert rule. --- pkg/services/ngalert/models/testing.go | 2 +- pkg/services/ngalert/store/alert_rule_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/services/ngalert/models/testing.go b/pkg/services/ngalert/models/testing.go index 29d538e8f99..82b0ab7d443 100644 --- a/pkg/services/ngalert/models/testing.go +++ b/pkg/services/ngalert/models/testing.go @@ -60,7 +60,7 @@ func AlertRuleGen(mutators ...AlertRuleMutator) func() *AlertRule { rule := &AlertRule{ ID: rand.Int63n(1500), - OrgID: rand.Int63n(1500), + OrgID: rand.Int63n(1500) + 1, // Prevent OrgID=0 as this does not pass alert rule validation. Title: "TEST-ALERT-" + util.GenerateShortUID(), Condition: "A", Data: []AlertQuery{GenerateAlertQuery()}, diff --git a/pkg/services/ngalert/store/alert_rule_test.go b/pkg/services/ngalert/store/alert_rule_test.go index 0b0cc72ade2..1471109ba4a 100644 --- a/pkg/services/ngalert/store/alert_rule_test.go +++ b/pkg/services/ngalert/store/alert_rule_test.go @@ -52,7 +52,6 @@ func TestIntegrationUpdateAlertRules(t *testing.T) { }) t.Run("should fail due to optimistic locking if version does not match", func(t *testing.T) { - t.Skip() // This test intermittently fails. rule := createRule(t, store) rule.Version-- // simulate version discrepancy