RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-03-25 04:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Silence test to remove unnecessary wait.

Browse Source 
As noted in #2867, there is an unnecessary require.Eventually in a
silence test. This PR addresses that by using a channel to signal that
that the maintenance loop has completed.

Signed-off-by: Joe Blubaugh <joe.blubaugh@grafana.com>
This commit is contained in:
Joe Blubaugh 2022-07-05 22:00:13 +08:00
parent a68fcc0445
commit 01d1e49c54
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
silence/silence_test.go
View File

@ -29,7 +29,6 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"go.uber.org/atomic"
pb "github.com/prometheus/alertmanager/silence/silencepb"
"github.com/prometheus/alertmanager/types"
@ -211,21 +210,26 @@ func TestSilences_Maintenance_SupportsCustomCallback(t *testing.T) {
s := &Silences{st: state{}, logger: log.NewNopLogger(), clock: clock, metrics: newMetrics(nil, nil)}
stopc := make(chan struct{})
calls := atomic.NewInt32(0)
go s.Maintenance(100*time.Millisecond, f.Name(), stopc, func() (int64, error) {
calls.Add(1)
return 0, nil
})
called := make(chan struct{}, 5)
go func() {
s.Maintenance(100*time.Millisecond, f.Name(), stopc, func() (int64, error) {
called <- struct{}{}
return 0, nil
})
close(called)
}()
runtime.Gosched()
clock.Add(100 * time.Millisecond)
// Stop the maintenance loop. We should get exactly one more execution of the maintenance func.
close(stopc)
calls := 0
for range called {
calls++
}
require.Eventually(t, func() bool {
return calls.Load() == 2
}, 100*time.Millisecond, 1*time.Millisecond)
require.EqualValues(t, 2, calls)
}
func TestSilencesSetSilence(t *testing.T) {