fix: commit_queue_test should use s.ctx

trigger/commit_queue_test.go

@@ -23,9 +23,11 @@ func TestCommitQueueTriggers(t *testing.T) {
 }
 
 type commitQueueSuite struct {
-	event event.EventLogEntry
-	data  *event.CommitQueueEventData
-	subs  []event.Subscription
+	event  event.EventLogEntry
+	data   *event.CommitQueueEventData
+	subs   []event.Subscription
+	ctx    context.Context
+	cancel context.CancelFunc
 
 	t *commitQueueTriggers
 
@@ -37,6 +39,8 @@ func (s *commitQueueSuite) SetupSuite() {
 }
 
 func (s *commitQueueSuite) SetupTest() {
+	s.ctx, s.cancel = context.WithCancel(context.Background())
+
 	s.NoError(db.ClearCollections(event.EventCollection, patch.Collection, event.SubscriptionsCollection, event.SubscriptionsCollection, model.ProjectRefCollection))
 
 	s.data = &event.CommitQueueEventData{
@@ -80,11 +84,12 @@ func (s *commitQueueSuite) SetupTest() {
 	s.t.patch = &p
 }
 
-func (s *commitQueueSuite) TestEmailUnescapesDescription() {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+func (s *commitQueueSuite) TearDownTest() {
+	s.cancel()
+}
 
-	n, err := s.t.commitQueueOutcome(ctx, &s.subs[0])
+func (s *commitQueueSuite) TestEmailUnescapesDescription() {
+	n, err := s.t.commitQueueOutcome(s.ctx, &s.subs[0])
 	s.NoError(err)
 	s.NotNil(n)
 	payload, ok := n.Payload.(*message.Email)