diff --git a/test/base.fixture.ts b/test/base.fixture.ts index 9c22e1d384..744b3b4158 100644 --- a/test/base.fixture.ts +++ b/test/base.fixture.ts @@ -107,21 +107,15 @@ registerWorkerFixture('playwright', async({parallelIndex}, test) => { connection.onmessage = message => transport.send(JSON.stringify(message)); transport.onmessage = message => connection.dispatch(JSON.parse(message)); const playwrightObject = await connection.waitForObjectWithKnownName('Playwright'); - try { - await test(playwrightObject); - } finally { - spawnedProcess.removeListener('exit', onExit); - spawnedProcess.stdin.destroy(); - spawnedProcess.stdout.destroy(); - spawnedProcess.stderr.destroy(); - await teardownCoverage(); - } + await test(playwrightObject); + spawnedProcess.removeListener('exit', onExit); + spawnedProcess.stdin.destroy(); + spawnedProcess.stdout.destroy(); + spawnedProcess.stderr.destroy(); + await teardownCoverage(); } else { - try { - await test(require('../index')) - } finally { - await teardownCoverage(); - } + await test(require('../index')) + await teardownCoverage(); } async function teardownCoverage() { @@ -144,24 +138,18 @@ registerWorkerFixture('browserType', async ({playwright}, test) => { registerWorkerFixture('browser', async ({browserType, defaultBrowserOptions}, test) => { const browser = await browserType.launch(defaultBrowserOptions); - try { - await test(browser); - if (browser.contexts().length !== 0) { - console.warn(`\nWARNING: test did not close all created contexts! ${new Error().stack}\n`); - await Promise.all(browser.contexts().map(context => context.close())); - } - } finally { - await browser.close(); + await test(browser); + if (browser.contexts().length !== 0) { + console.warn(`\nWARNING: test did not close all created contexts! ${new Error().stack}\n`); + await Promise.all(browser.contexts().map(context => context.close())).catch(e => void 0); } + await browser.close(); }); registerFixture('context', async ({browser}, test) => { const context = await browser.newContext(); - try { - await test(context); - } finally { - await context.close(); - } + await test(context); + await context.close(); }); registerFixture('page', async ({context}, test) => { diff --git a/test/chromium/oopif.spec.ts b/test/chromium/oopif.spec.ts index d2962a9838..e414433b5c 100644 --- a/test/chromium/oopif.spec.ts +++ b/test/chromium/oopif.spec.ts @@ -30,20 +30,14 @@ registerFixture('sppBrowser', async ({browserType, defaultBrowserOptions}, test) ...defaultBrowserOptions, args: (defaultBrowserOptions.args || []).concat(['--site-per-process']) }); - try { - await test(browser); - } finally { - await browser.close(); - } + await test(browser); + await browser.close(); }); registerFixture('sppContext', async ({sppBrowser}, test) => { const context = await sppBrowser.newContext(); - try { - await test(context); - } finally { - await context.close(); - } + await test(context); + await context.close(); }); registerFixture('sppPage', async ({sppContext}, test) => { diff --git a/test/defaultbrowsercontext.spec.ts b/test/defaultbrowsercontext.spec.ts index 0bae14cc88..eab2fa27ce 100644 --- a/test/defaultbrowsercontext.spec.ts +++ b/test/defaultbrowsercontext.spec.ts @@ -32,11 +32,8 @@ declare global { } registerFixture('userDataDir', async ({}, test) => { const userDataDir = await mkdtempAsync(path.join(os.tmpdir(), 'playwright_dev_profile-')); - try { - await test(userDataDir); - } finally { - removeFolderAsync(userDataDir).catch(e => {}); - } + await test(userDataDir); + removeFolderAsync(userDataDir).catch(e => {}); }); registerFixture('launchPersistent', async ({userDataDir, defaultBrowserOptions, browserType}, test) => { @@ -48,12 +45,9 @@ registerFixture('launchPersistent', async ({userDataDir, defaultBrowserOptions, const page = context.pages()[0]; return {context, page}; } - try { - await test(launchPersistent); - } finally { - if (context) - await context.close(); - } + await test(launchPersistent); + if (context) + await context.close(); }); it('context.cookies() should work', async ({server, launchPersistent}) => { diff --git a/test/download.spec.ts b/test/download.spec.ts index b1f2c9bf0b..4031deb8c9 100644 --- a/test/download.spec.ts +++ b/test/download.spec.ts @@ -30,11 +30,8 @@ declare global { } registerFixture('persistentDirectory', async ({}, test) => { const persistentDirectory = await mkdtempAsync(path.join(os.tmpdir(), 'playwright-test-')); - try { - await test(persistentDirectory); - } finally { - await removeFolderAsync(persistentDirectory); - } + await test(persistentDirectory); + await removeFolderAsync(persistentDirectory); }); beforeEach(async ({server}) => { diff --git a/test/downloads-path.spec.ts b/test/downloads-path.spec.ts index cf9f8b1d5e..0c04582b9c 100644 --- a/test/downloads-path.spec.ts +++ b/test/downloads-path.spec.ts @@ -30,11 +30,8 @@ declare global { } registerFixture('downloadsPath', async ({}, test) => { const downloadsPath = await mkdtempAsync(path.join(os.tmpdir(), 'playwright-test-')); - try { - await test(downloadsPath); - } finally { - await removeFolderAsync(downloadsPath); - } + await test(downloadsPath); + await removeFolderAsync(downloadsPath); }); registerFixture('downloadsBrowser', async ({server, browserType, defaultBrowserOptions, downloadsPath}, test) => { @@ -47,11 +44,8 @@ registerFixture('downloadsBrowser', async ({server, browserType, defaultBrowserO ...defaultBrowserOptions, downloadsPath: downloadsPath, }); - try { - await test(browser); - } finally { - await browser.close(); - } + await test(browser); + await browser.close(); }); registerFixture('persistentDownloadsContext', async ({server, browserType, defaultBrowserOptions, downloadsPath}, test) => { @@ -71,12 +65,9 @@ registerFixture('persistentDownloadsContext', async ({server, browserType, defau ); const page = context.pages()[0]; page.setContent(`download`); - try { - await test(context); - } finally { - await context.close(); - await removeFolderAsync(userDataDir); - } + await test(context); + await context.close(); + await removeFolderAsync(userDataDir); }); it('should keep downloadsPath folder', async({downloadsBrowser, downloadsPath, server}) => { diff --git a/test/electron/electron.fixture.ts b/test/electron/electron.fixture.ts index f031fff253..a782d48041 100644 --- a/test/electron/electron.fixture.ts +++ b/test/electron/electron.fixture.ts @@ -20,18 +20,12 @@ registerFixture('application', async ({playwright}, test) => { const application = await playwright.electron.launch(electronPath, { args: [path.join(__dirname, 'testApp.js')], }); - try { - await test(application); - } finally { - await application.close(); - } + await test(application); + await application.close(); }); registerFixture('window', async ({application}, test) => { const page = await application.newBrowserWindow({ width: 800, height: 600 }); - try { - await test(page); - } finally { - await page.close(); - } + await test(page); + await page.close(); }); diff --git a/test/screencast.spec.ts b/test/screencast.spec.ts index f93bc143c3..2befa84174 100644 --- a/test/screencast.spec.ts +++ b/test/screencast.spec.ts @@ -33,11 +33,8 @@ declare global { registerFixture('persistentDirectory', async ({}, test) => { const persistentDirectory = await mkdtempAsync(path.join(os.tmpdir(), 'playwright-test-')); - try { - await test(persistentDirectory); - } finally { - await removeFolderAsync(persistentDirectory); - } + await test(persistentDirectory); + await removeFolderAsync(persistentDirectory); }); registerFixture('videoPlayer', async ({playwright, context}, test) => { @@ -48,17 +45,13 @@ registerFixture('videoPlayer', async ({playwright, context}, test) => { context = await firefox.newContext(); } - let page; - try { - page = await context.newPage(); - const player = new VideoPlayer(page); - await test(player); - } finally { - if (firefox) - await firefox.close(); - else - await page.close(); - } + const page = await context.newPage(); + const player = new VideoPlayer(page); + await test(player); + if (firefox) + await firefox.close(); + else + await page.close(); }); function almostRed(r, g, b, alpha) {