fix test

johnstcn · johnstcn · commit b174ea42f426 · 2025-04-22T12:16:00.000+01:00
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -2125,25 +2125,20 @@ func TestNotificationEnqueuePubsubNotify(t *testing.T) {
 
 	user := createSampleUser(t, store)
 
-	// When: a notification is enqueued
-
-	// Then: we attempt to dispatch the notification immediately.
+	// Given: the manager is running and the fetch interval is set to 1 minute.
 	mgr.Run(ctx)
-	wt := fetchTrap.MustWait(ctx)
-	// TODO: this happens *before* manager starts listening. Need to wait.
+	fetchTrap.MustWait(ctx).Release() // Wait for one tick of the notifier to elapse.
+
+	// When: a notification is enqueued
 	_, err = enq.Enqueue(ctx, user.ID, notifications.TemplateWorkspaceDeleted, map[string]string{}, "test")
 	require.NoError(t, err)
-	wt.Release()
-	d, w := mClock.AdvanceNext()
-	t.Logf("advanced %s", d)
 
+	// 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,
 	})
-
-	<-w.Done() // TODO: this hangs and fails.
 }
 
 type fakeHandler struct {
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -108,11 +108,6 @@ func (n *notifier) run(success chan<- dispatchResult, failure chan<- dispatchRes
 		n.log.Info(context.Background(), "gracefully stopped")
 	}()
 
-	// TODO: idea from Cian: instead of querying the database on a short interval, we could wait for pubsub notifications.
-	//		 if 100 notifications are enqueued, we shouldn't activate this routine for each one; so how to debounce these?
-	//		 PLUS we should also have an interval (but a longer one, maybe 1m) to account for retries (those will not get
-	//     triggered by a code path, but rather by a timeout expiring which makes the message retryable)
-
 	// loopTick is used to synchronize the goroutine that processes messages with the ticker.
 	loopTick := make(chan chan struct{})
 	// loopDone is used to signal when the processing loop has exited due to
