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

fix: implement log scale back-off for screenshots (#12504)

Browse source 
References https://github.com/microsoft/playwright/issues/12441
This commit is contained in:
Andrey Lushnikov 2022-03-04 19:17:57 -07:00 committed by GitHub
parent 4953fc4845
commit 6dac01aec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright-core/src/server/frames.ts
View file

@ -1058,7 +1058,7 @@ export class Frame extends SdkObject {
}); });
} }
async rafrafTimeoutScreenshotElementWithProgress(progress: Progress, selector: string, timeout: number, options: ScreenshotOptions): Promise<Buffer|undefined> { async rafrafTimeoutScreenshotElementWithProgress(progress: Progress, selector: string, timeout: number, options: ScreenshotOptions): Promise<Buffer> {
return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, async handle => { return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, async handle => {
await handle._frame.rafrafTimeout(timeout); await handle._frame.rafrafTimeout(timeout);
return await this._page._screenshotter.screenshotElement(progress, handle, options); return await this._page._screenshotter.screenshotElement(progress, handle, options);

8
packages/playwright-core/src/server/page.ts
View file

@ -461,21 +461,21 @@ export class Page extends SdkObject {
return controller.run(async progress => { return controller.run(async progress => {
let actual: Buffer | undefined; let actual: Buffer | undefined;
let previous: Buffer | undefined; let previous: Buffer | undefined;
let screenshotTimeout = 0; const pollIntervals = [0, 100, 250, 500];
while (true) { while (true) {
progress.throwIfAborted(); progress.throwIfAborted();
if (this.isClosed()) if (this.isClosed())
throw new Error('The page has closed'); throw new Error('The page has closed');
let comparatorResult: ComparatorResult | undefined; let comparatorResult: ComparatorResult | undefined;
const screenshotTimeout = pollIntervals.shift() || 1000;
if (isGeneratingNewScreenshot) { if (isGeneratingNewScreenshot) {
previous = actual; previous = actual;
actual = await rafrafScreenshot(progress, screenshotTimeout); actual = await rafrafScreenshot(progress, screenshotTimeout).catch(e => undefined);
comparatorResult = actual && previous ? comparator(actual, previous, options.comparatorOptions) : undefined; comparatorResult = actual && previous ? comparator(actual, previous, options.comparatorOptions) : undefined;
} else { } else {
actual = await rafrafScreenshot(progress, screenshotTimeout); actual = await rafrafScreenshot(progress, screenshotTimeout).catch(e => undefined);
comparatorResult = actual ? comparator(actual, options.expected!, options.comparatorOptions) : undefined; comparatorResult = actual ? comparator(actual, options.expected!, options.comparatorOptions) : undefined;
} }
screenshotTimeout = 150;
if (comparatorResult !== undefined && !!comparatorResult === !!options.isNot) if (comparatorResult !== undefined && !!comparatorResult === !!options.isNot)
break; break;
if (comparatorResult) if (comparatorResult)