Skip to content

fix: prevent retry config accumulation #5606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smalia2001 wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+27 −5
Open

fix: prevent retry config accumulation #5606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions lib/helper/Playwright.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,8 @@ class Playwright extends Helper {
// Clear popup state to ensure clean state for each test
popupStore.clear()

recorder.retry({
// Configure retry for this test; will clean up after test completes
this._retryConfig = {
retries: test?.opts?.conditionalRetries || 3,
when: err => {
if (!err || typeof err.message !== 'string') {
Expand All @@ -584,7 +585,8 @@ class Playwright extends Helper {
// ignore context errors
return err.message.includes('context')
},
})
}
recorder.retry(this._retryConfig)

// Start browser if needed (initial start or browser restart strategy)
if (!this.isRunning && !this.options.manualStart) await this._startBrowser()
Expand Down Expand Up @@ -689,6 +691,12 @@ class Playwright extends Helper {
}

async _after() {
// Clean up our retry config to prevent accumulation
if (this._retryConfig) {
recorder.retries = recorder.retries.filter(r => r !== this._retryConfig)
this._retryConfig = null
}

if (!this.isRunning) return

// Clear popup state to prevent leakage between tests
Expand Down
12 changes: 10 additions & 2 deletions lib/helper/Puppeteer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@ class Puppeteer extends Helper {
async _before(test) {
this.sessionPages = {}
this.currentRunningTest = test
recorder.retry({
// Configure retry for this test; will clean up after test completes
this._retryConfig = {
retries: test?.opts?.conditionalRetries || 3,
when: err => {
if (!err || typeof err.message !== 'string') {
Expand All @@ -363,13 +364,20 @@ class Puppeteer extends Helper {
// ignore context errors
return err.message.includes('context')
},
})
}
recorder.retry(this._retryConfig)
if (this.options.restart && !this.options.manualStart) return this._startBrowser()
if (!this.isRunning && !this.options.manualStart) return this._startBrowser()
return this.browser
}

async _after() {
// Clean up our retry config to prevent accumulation
if (this._retryConfig) {
recorder.retries = recorder.retries.filter(r => r !== this._retryConfig)
this._retryConfig = null
}

if (!this.isRunning) return

// Clear popup state to prevent leakage between tests
Expand Down
8 changes: 7 additions & 1 deletion lib/plugin/retryFailedStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ export default function (config) {
test.opts.stepRetryPriority = stepRetryPriority

debug('applying retries = %d for test %s', config.retries, test.title)
recorder.retry(config)
if (!recorder.retries.find(r => r === config)) {
recorder.retry(config)
}
})

event.dispatcher.on(event.test.started, test => {
Expand All @@ -171,4 +173,8 @@ export default function (config) {
test.opts.conditionalRetries = test.opts.conditionalRetries || config.retries
}
})

event.dispatcher.on(event.test.after, () => {
recorder.retries = recorder.retries.filter(r => r !== config)
})
}
Loading