NotificationsYou must be signed in to change notification settings
Fork926
Star10.1k

Commitb3aba6d

authored

test: ignore context.Canceled in acquireWithCancel (#17448)

fixescoder/internal#584Ignore canceled error when sending an acquired job, since dRPC is racy and will sometimes return this error even after successfully sending the job, if the test is quickly finished.

1 parentdaafa0d commitb3aba6dCopy full SHA for b3aba6d

File tree

1 file changed

-1

lines changed

provisionerd
- provisionerd_test.go

1 file changed

-1

lines changed

`‎provisionerd/provisionerd_test.go`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1270,6 +1270,11 @@ func (a *acquireOne) acquireWithCancel(stream proto.DRPCProvisionerDaemon_Acquir`
`1270`	`1270`	`returnnil`
`1271`	`1271`	`}`
`1272`	`1272`	`err:=stream.Send(a.job)`
`1273`		`-assert.NoError(a.t,err)`
	`1273`	`+// dRPC is racy, and sometimes will return context.Canceled after it has successfully sent the message if we cancel`
	`1274`	`+// right away, e.g. in unit tests that complete. So, just swallow the error in that case. If we are canceled before`
	`1275`	`+// the job was acquired, presumably something else in the test will have failed.`
	`1276`	`+if!xerrors.Is(err,context.Canceled) {`
	`1277`	`+assert.NoError(a.t,err)`
	`1278`	`+}`
`1274`	`1279`	`returnnil`
`1275`	`1280`	`}`

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!

Commitb3aba6d

File tree

1 file changed

1 file changed

`‎provisionerd/provisionerd_test.go`

0 commit comments