Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(test): speculative attempt to fix trace viewer test flakiness (3) (#15342)

Browse source
This commit is contained in:
Pavel Feldman 2022-07-03 10:55:18 -08:00 committed by GitHub
parent c3c724f17d
commit 9e62cc4da9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/playwright-core/src/server/trace/viewer/traceViewer.ts
View file

@ -81,12 +81,16 @@ export async function showTraceViewer(traceUrls: string[], browserName: string,
if (traceViewerBrowser === 'chromium') if (traceViewerBrowser === 'chromium')
await installAppIcon(page); await installAppIcon(page);
if (isUnderTest())
page.on('close', () => context.close(serverSideCallMetadata()).catch(() => {}));
else
page.on('close', () => process.exit());
const searchQuery = traceUrls.length ? '?' + traceUrls.map(t => `trace=${t}`).join('&') : ''; const params = traceUrls.map(t => `trace=${t}`);
if (isUnderTest()) {
params.push('isUnderTest=true');
page.on('close', () => context.close(serverSideCallMetadata()).catch(() => {}));
} else {
page.on('close', () => process.exit());
}
const searchQuery = params.length ? '?' + params.join('&') : '';
await page.mainFrame().goto(serverSideCallMetadata(), urlPrefix + `/trace/index.html${searchQuery}`); await page.mainFrame().goto(serverSideCallMetadata(), urlPrefix + `/trace/index.html${searchQuery}`);
return context; return context;
} }

3
packages/trace-viewer/src/index.tsx
View file

@ -24,7 +24,8 @@ import '@web/common.css';
(async () => { (async () => {
applyTheme(); applyTheme();
if (window.location.protocol !== 'file:') { if (window.location.protocol !== 'file:') {
await new Promise(f => setTimeout(f, 500)); if (window.location.href.includes('isUnderTest=true'))
await new Promise(f => setTimeout(f, 1000));
navigator.serviceWorker.register('sw.bundle.js'); navigator.serviceWorker.register('sw.bundle.js');
if (!navigator.serviceWorker.controller) { if (!navigator.serviceWorker.controller) {
await new Promise<void>(f => { await new Promise<void>(f => {