test enqeueue multiple

johnstcn · johnstcn · commit 5abde6d66cdf · 2025-05-19T17:03:14.000+01:00
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -2152,16 +2152,27 @@ func TestNotificationEnqueuePubsubNotify(t *testing.T) {
 	mgr.Run(ctx)
 	fetchTrap.MustWait(ctx).Release()
 
-	// When: a notification is enqueued
-	_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, map[string]string{}, "test")
-	require.NoError(t, err)
+	// When: a number of notifications are enqueued
+	const numEnqueued = 10
+	for i := range numEnqueued {
+		_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, map[string]string{"i": fmt.Sprintf("%d", i)}, fmt.Sprintf("test %d", i))
+		require.NoError(t, err)
+	}
 
 	// Then: we attempt to dispatch the notification immediately.
-	call := testutil.TryReceive(ctx, t, handler.calls)
-	testutil.RequireSend(ctx, t, call.result, dispatchResult{
-		retryable: false,
-		err:       nil,
-	})
+	recvDone := make(chan struct{})
+	go func() {
+		defer close(recvDone)
+		for range numEnqueued {
+			call := testutil.TryReceive(ctx, t, handler.calls)
+			<-time.After(testutil.IntervalFast) // Simulate some processing time.
+			testutil.RequireSend(ctx, t, call.result, dispatchResult{
+				retryable: false,
+				err:       nil,
+			})
+		}
+	}()
+	_ = testutil.TryReceive(ctx, t, recvDone)
 }
 
 type fakeHandler struct {
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -153,7 +153,7 @@ func (n *notifier) run(success chan<- dispatchResult, failure chan<- dispatchRes
 			return
 		// This is a no-op if the notifier is paused.
 		case loopTick <- c:
-			<-c // Wait for the processing loop to finish.
+			// We do not wait for the processing loop to finish here.
 		default:
 			// If the loop is busy, don't send a notification.
 			n.log.Debug(ctx, "notifier busy, skipping notification")
