From 5f5298ad255ee460193046b3239ca0fd62734cd2 Mon Sep 17 00:00:00 2001 From: George Robinson Date: Tue, 16 Nov 2021 17:58:48 +0000 Subject: [PATCH] Alerting: Use require.ElementsMatch in TestEvaluateExecutionResultsNoData --- pkg/services/ngalert/eval/eval_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go index c4cb12f457d..d470a9f03eb 100644 --- a/pkg/services/ngalert/eval/eval_test.go +++ b/pkg/services/ngalert/eval/eval_test.go @@ -2,7 +2,6 @@ package eval import ( "fmt" - "sort" "testing" "time" @@ -321,11 +320,14 @@ func TestEvaluateExecutionResultsNoData(t *testing.T) { require.Len(t, v, 2) require.Equal(t, NoData, v[0].State) require.Equal(t, NoData, v[1].State) - datasourceUIDs := []string{ - v[0].Instance["datasource_uid"], - v[1].Instance["datasource_uid"], + + datasourceUIDs := make([]string, 0, len(v)) + for _, next := range v { + datasourceUID, ok := next.Instance["datasource_uid"] + require.True(t, ok) + require.NotEqual(t, "", datasourceUID) + datasourceUIDs = append(datasourceUIDs, datasourceUID) } - sort.Strings(datasourceUIDs) - require.Equal(t, []string{"1", "2"}, datasourceUIDs) + require.ElementsMatch(t, []string{"1", "2"}, datasourceUIDs) }) }