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

make test more stable (#51268)

Browse Source
This commit is contained in:
Yuriy Tseretyan 2022-06-22 12:53:16 -04:00 committed by GitHub
parent fe5416508a
commit ee5bcf2b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/services/ngalert/models/alert_rule_test.go
View File

@ -548,14 +548,23 @@ func TestDiff(t *testing.T) {
} }
func TestSortByGroupIndex(t *testing.T) { func TestSortByGroupIndex(t *testing.T) {
t.Run("should sort rules by GroupIndex", func(t *testing.T) { ensureNotSorted := func(t *testing.T, rules []*AlertRule, less func(i, j int) bool) {
rules := GenerateAlertRules(rand.Intn(5)+5, AlertRuleGen(WithUniqueGroupIndex())) for i := 0; i < 5; i++ {
rand.Shuffle(len(rules), func(i, j int) { rand.Shuffle(len(rules), func(i, j int) {
rules[i], rules[j] = rules[j], rules[i] rules[i], rules[j] = rules[j], rules[i]
}) })
require.False(t, sort.SliceIsSorted(rules, func(i, j int) bool { if !sort.SliceIsSorted(rules, less) {
return
}
}
t.Fatalf("unable to ensure that alerts are not sorted")
}
t.Run("should sort rules by GroupIndex", func(t *testing.T) {
rules := GenerateAlertRules(rand.Intn(15)+5, AlertRuleGen(WithUniqueGroupIndex()))
ensureNotSorted(t, rules, func(i, j int) bool {
return rules[i].RuleGroupIndex < rules[j].RuleGroupIndex return rules[i].RuleGroupIndex < rules[j].RuleGroupIndex
})) })
RulesGroup(rules).SortByGroupIndex() RulesGroup(rules).SortByGroupIndex()
require.True(t, sort.SliceIsSorted(rules, func(i, j int) bool { require.True(t, sort.SliceIsSorted(rules, func(i, j int) bool {
return rules[i].RuleGroupIndex < rules[j].RuleGroupIndex return rules[i].RuleGroupIndex < rules[j].RuleGroupIndex
@ -563,13 +572,10 @@ func TestSortByGroupIndex(t *testing.T) {
}) })
t.Run("should sort by ID if same GroupIndex", func(t *testing.T) { t.Run("should sort by ID if same GroupIndex", func(t *testing.T) {
rules := GenerateAlertRules(rand.Intn(5)+5, AlertRuleGen(WithUniqueID(), WithGroupIndex(rand.Int()))) rules := GenerateAlertRules(rand.Intn(15)+5, AlertRuleGen(WithUniqueID(), WithGroupIndex(rand.Int())))
rand.Shuffle(len(rules), func(i, j int) { ensureNotSorted(t, rules, func(i, j int) bool {
rules[i], rules[j] = rules[j], rules[i]
})
require.False(t, sort.SliceIsSorted(rules, func(i, j int) bool {
return rules[i].ID < rules[j].ID return rules[i].ID < rules[j].ID
})) })
RulesGroup(rules).SortByGroupIndex() RulesGroup(rules).SortByGroupIndex()
require.True(t, sort.SliceIsSorted(rules, func(i, j int) bool { require.True(t, sort.SliceIsSorted(rules, func(i, j int) bool {
return rules[i].ID < rules[j].ID return rules[i].ID < rules[j].ID