From 571b08638d60dcbcc309c0d870f6f5af1bc0cfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 31 Mar 2019 20:44:54 -0700 Subject: [PATCH] fix(tests): correctly setup silences for filter tests ft.Silence is not a pointer so it's never null, fix the check to use the ID which will default to empty string if Silence object is not populated --- internal/filters/filter_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/filters/filter_test.go b/internal/filters/filter_test.go index 9a1f78eb6..750413196 100644 --- a/internal/filters/filter_test.go +++ b/internal/filters/filter_test.go @@ -552,16 +552,16 @@ func TestFilters(t *testing.T) { } for _, ft := range tests { alert := models.Alert(ft.Alert) - if &ft.Silence != nil { - alert.Alertmanager = []models.AlertmanagerInstance{ - models.AlertmanagerInstance{ - Name: am.Name, - Silences: map[string]*models.Silence{ - ft.Silence.ID: &ft.Silence, - }, - SilencedBy: []string{ft.Silence.ID}, - }, - } + alert.Alertmanager = []models.AlertmanagerInstance{ + models.AlertmanagerInstance{ + Name: am.Name, + Silences: map[string]*models.Silence{}, + SilencedBy: []string{}, + }, + } + if ft.Silence.ID != "" { + alert.Alertmanager[0].Silences[ft.Silence.ID] = &ft.Silence + alert.Alertmanager[0].SilencedBy = append(alert.Alertmanager[0].SilencedBy, ft.Silence.ID) } f := filters.NewFilter(ft.Expression)