Skip to content

Commit 6cc488a

Browse files
authored
Fix EventKindJobSnoozed detection in rivertest.Worker (#1057)
#1037 added `CompleterJobUpdated.Snoozed`, which needs to be checked first when determining EventKind.
1 parent e6548a6 commit 6cc488a

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

rivertest/worker.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -243,20 +243,24 @@ func completerResultToWorkResult(tb testing.TB, completerResult jobcompleter.Com
243243
tb.Helper()
244244

245245
var kind river.EventKind
246-
switch completerResult.Job.State {
247-
case rivertype.JobStateCancelled:
248-
kind = river.EventKindJobCancelled
249-
case rivertype.JobStateCompleted:
250-
kind = river.EventKindJobCompleted
251-
case rivertype.JobStateScheduled:
246+
if completerResult.Snoozed {
252247
kind = river.EventKindJobSnoozed
253-
case rivertype.JobStateAvailable, rivertype.JobStateDiscarded, rivertype.JobStateRetryable, rivertype.JobStateRunning:
254-
kind = river.EventKindJobFailed
255-
case rivertype.JobStatePending:
256-
panic("test worker internal error: completion subscriber unexpectedly received job in pending state, river bug")
257-
default:
258-
// linter exhaustive rule prevents this from being reached
259-
panic("test worker internal error: unreachable state to distribute, river bug")
248+
} else {
249+
switch completerResult.Job.State {
250+
case rivertype.JobStateCancelled:
251+
kind = river.EventKindJobCancelled
252+
case rivertype.JobStateCompleted:
253+
kind = river.EventKindJobCompleted
254+
case rivertype.JobStateScheduled:
255+
kind = river.EventKindJobSnoozed
256+
case rivertype.JobStateAvailable, rivertype.JobStateDiscarded, rivertype.JobStateRetryable, rivertype.JobStateRunning:
257+
kind = river.EventKindJobFailed
258+
case rivertype.JobStatePending:
259+
panic("test worker internal error: completion subscriber unexpectedly received job in pending state, river bug")
260+
default:
261+
// linter exhaustive rule prevents this from being reached
262+
panic("test worker internal error: unreachable state to distribute, river bug")
263+
}
260264
}
261265

262266
return &WorkResult{

0 commit comments

Comments
 (0)