fix: handle postgres query cancellation in TestAcquireJobWithCancel_Cancel

sreya · sreya · commit 13285c30dd17 · 2025-06-19T02:07:39.000Z
The test was failing because it was checking for context.Canceled using
xerrors.Is, but postgres returns a different error ("pq: canceling
statement due to user request") when a query is cancelled. This change
uses database.IsQueryCanceledError which properly handles both
context.Canceled and postgres-specific cancellation errors.
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -368,7 +368,7 @@ func (s *server) AcquireJobWithCancel(stream proto.DRPCProvisionerDaemon_Acquire
 		je = <-jec
 	case je = <-jec:
 	}
-	if xerrors.Is(je.err, context.Canceled) {
+	if database.IsQueryCanceledError(je.err) {
 		s.Logger.Debug(streamCtx, "successful cancel")
 		err := stream.Send(&proto.AcquiredJob{})
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ func (s *server) AcquireJobWithCancel(stream proto.DRPCProvisionerDaemon_Acquire`
`368`	`368`	`je = <-jec`
`369`	`369`	`case je = <-jec:`
`370`	`370`	`}`
`371`		`- if xerrors.Is(je.err, context.Canceled) {`
	`371`	`+ if database.IsQueryCanceledError(je.err) {`
`372`	`372`	`s.Logger.Debug(streamCtx, "successful cancel")`
`373`	`373`	`err := stream.Send(&proto.AcquiredJob{})`
`374`	`374`	`if err != nil {`