Skip to content

Commit 406beb5

Browse files
authored
Try to fix TestMultitenantAlertmanager_FirewallShouldBlockHTTPBasedReceiversWhenEnabled flakyness (cortexproject#4120)
Signed-off-by: Marco Pracucci <marco@pracucci.com>
1 parent a73e80e commit 406beb5

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkg/alertmanager/multitenant_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,13 @@ receivers:
363363

364364
for receiverName, testData := range tests {
365365
for _, firewallEnabled := range []bool{true, false} {
366-
t.Run(fmt.Sprintf("%s firewall: %v", receiverName, firewallEnabled), func(t *testing.T) {
366+
receiverName := receiverName
367+
testData := testData
368+
firewallEnabled := firewallEnabled
369+
370+
t.Run(fmt.Sprintf("receiver=%s firewall enabled=%v", receiverName, firewallEnabled), func(t *testing.T) {
371+
t.Parallel()
372+
367373
ctx := context.Background()
368374
userID := "user-1"
369375
serverInvoked := atomic.NewBool(false)
@@ -435,7 +441,7 @@ receivers:
435441

436442
// Ensure the server endpoint has not been called if firewall is enabled. Since the alert is delivered
437443
// asynchronously, we should pool it for a short period.
438-
deadline := time.Now().Add(time.Second)
444+
deadline := time.Now().Add(3 * time.Second)
439445
for {
440446
if time.Now().After(deadline) || serverInvoked.Load() {
441447
break

0 commit comments

Comments
 (0)