From 2f27a5240b696ca69ce42d932c7ab0866c7b273b Mon Sep 17 00:00:00 2001 From: gotjosh Date: Tue, 24 Aug 2021 17:22:11 +0100 Subject: [PATCH] Alerting: Fix flake on test receiver tests (#38511) * Alerting: Fix flake on test receiver tests * Make the actual result from the API be sorted * Use the correct letters --- pkg/services/ngalert/notifier/receivers.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/services/ngalert/notifier/receivers.go b/pkg/services/ngalert/notifier/receivers.go index 202c4954dbb..4985183d102 100644 --- a/pkg/services/ngalert/notifier/receivers.go +++ b/pkg/services/ngalert/notifier/receivers.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/url" + "sort" "time" 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 { 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 }