Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/recorder.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export default {
}

const retryRules = this.retries.slice().reverse()
return promiseRetry(Object.assign(defaultRetryOptions, retryOpts), (retry, number) => {
return promiseRetry(Object.assign({}, defaultRetryOptions, retryOpts), (retry, number) => {
if (number > 1) output.log(`${currentQueue()}Retrying... Attempt #${number}`)
const [promise, timer] = getTimeoutPromise(timeout, taskName)
return Promise.race([promise, Promise.resolve(res).then(fn)])
Expand Down
48 changes: 48 additions & 0 deletions test/unit/recorder_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,54 @@ describe('Recorder', () => {
return recorder.promise()
})

it('should not leak custom minTimeout to subsequent recorder runs', async function () {
// Regression: Object.assign(defaultRetryOptions, retryOpts) mutated the
// module-level defaultRetryOptions object. A custom minTimeout in one run
// leaked into the defaults for every later run.
this.timeout(5000)

let attempts = []
recorder.retry({ retries: 1, minTimeout: 800, factor: 1, maxTimeout: 1000 })
recorder.add(
() => {
attempts.push(Date.now())
if (attempts.length < 2) throw new Error('first run')
},
undefined,
undefined,
true,
)
try {
await recorder.promise()
} catch (e) {
await recorder.catchWithoutStop(err => err)
}

expect(attempts[1] - attempts[0]).to.be.greaterThan(700, 'first retry should honor minTimeout=800')

// Fresh recorder, do not pass minTimeout — should fall back to default (150ms),
// not 800 leaked from the previous run.
recorder.start()
attempts = []
recorder.retry({ retries: 1, factor: 1, maxTimeout: 1000 })
recorder.add(
() => {
attempts.push(Date.now())
if (attempts.length < 2) throw new Error('second run')
},
undefined,
undefined,
true,
)
try {
await recorder.promise()
} catch (e) {
await recorder.catchWithoutStop(err => err)
}

expect(attempts[1] - attempts[0]).to.be.lessThan(500, 'second retry must use default minTimeout, not leaked 800ms')
})

it('should prefer opts for non-when retry when possible', () => {
let counter = 0
const errorText = 'noerror'
Expand Down