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 flake on test receiver tests (#38511)

Browse Source 
* Alerting: Fix flake on test receiver tests

* Make the actual result from the API be sorted

* Use the correct letters
This commit is contained in:
gotjosh 2021-08-24 17:22:11 +01:00 committed by GitHub
parent 6e639f3c72
commit 2f27a5240b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/services/ngalert/notifier/receivers.go
View File

@ -5,6 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/url" "net/url"
"sort"
"time" "time"
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@ -126,6 +127,12 @@ func (am *Alertmanager) TestReceivers(ctx context.Context, c apimodels.TestRecei
for _, next := range m { for _, next := range m {
v.Receivers = append(v.Receivers, next) v.Receivers = append(v.Receivers, next)
} }
// Make sure the return order is deterministic.
sort.Slice(v.Receivers, func(i, j int) bool {
return v.Receivers[i].Name < v.Receivers[j].Name
})
return v return v
} }