Commit49ff86f

blink-so[bot]

and

sreya

committed

fix: handle postgres query cancellation in TestAcquireJobWithCancel_Cancel

The test was failing because it was checking for context.Canceled usingxerrors.Is, but postgres returns a different error ("pq: cancelingstatement due to user request") when a query is cancelled. This changeuses database.IsQueryCanceledError which properly handles bothcontext.Canceled and postgres-specific cancellation errors.Co-authored-by: sreya <4856196+sreya@users.noreply.github.com>

1 parent04d202a commit49ff86fCopy full SHA for 49ff86f

File tree

1 file changed

-1

lines changed

coderd/provisionerdserver
- provisionerdserver.go

1 file changed

-1

lines changed

`‎coderd/provisionerdserver/provisionerdserver.go`

Lines changed: 1 addition & 1 deletion

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`	`caseje=<-jec:`
`370`	`370`	`}`
`371`		`-ifxerrors.Is(je.err,context.Canceled) {`
	`371`	`+ifdatabase.IsQueryCanceledError(je.err) {`
`372`	`372`	`s.Logger.Debug(streamCtx,"successful cancel")`
`373`	`373`	`err:=stream.Send(&proto.AcquiredJob{})`
`374`	`374`	`iferr!=nil {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit49ff86f

File tree

1 file changed

1 file changed

`‎coderd/provisionerdserver/provisionerdserver.go`

0 commit comments