From 1d0cd8bf59faff4642c4a423d51a53d7122d83a5 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:16:38 -0400 Subject: [PATCH] test: fixup flaky tests (#44379) * test: fixup flaky test Co-authored-by: John Kleinschmidt * test: disable flaky protocol speed test on macOS Co-authored-by: John Kleinschmidt * test: fixup flaky test in api-browser-window-spec.ts Co-authored-by: John Kleinschmidt --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- spec/api-browser-window-spec.ts | 8 +++++--- spec/api-protocol-spec.ts | 3 ++- spec/chromium-spec.ts | 12 +++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/spec/api-browser-window-spec.ts b/spec/api-browser-window-spec.ts index c0934d250e94..15c36e707acd 100755 --- a/spec/api-browser-window-spec.ts +++ b/spec/api-browser-window-spec.ts @@ -17,7 +17,7 @@ import * as nodeUrl from 'node:url'; import { emittedUntil, emittedNTimes } from './lib/events-helpers'; import { HexColors, hasCapturableScreen, ScreenCapture } from './lib/screen-helpers'; -import { ifit, ifdescribe, defer, listen } from './lib/spec-helpers'; +import { ifit, ifdescribe, defer, listen, waitUntil } from './lib/spec-helpers'; import { closeWindow, closeAllWindows } from './lib/window-helpers'; const fixtures = path.resolve(__dirname, 'fixtures'); @@ -6015,8 +6015,10 @@ describe('BrowserWindow module', () => { w.webContents.on('enter-html-full-screen', async () => { enterCount++; if (w.isFullScreen()) reject(new Error('w.isFullScreen should be false')); - const isFS = await w.webContents.executeJavaScript('!!document.fullscreenElement'); - if (!isFS) reject(new Error('Document should have fullscreen element')); + await waitUntil(async () => { + const isFS = await w.webContents.executeJavaScript('!!document.fullscreenElement'); + return isFS === true; + }); checkDone(); }); diff --git a/spec/api-protocol-spec.ts b/spec/api-protocol-spec.ts index 1ebcd855fd34..bdbdd9d383c7 100644 --- a/spec/api-protocol-spec.ts +++ b/spec/api-protocol-spec.ts @@ -1737,7 +1737,8 @@ describe('protocol module', () => { }); // TODO(nornagon): this test doesn't pass on Linux currently, investigate. - ifit(process.platform !== 'linux')('is fast', async () => { + // test is also flaky on CI on macOS so it is currently disabled there as well. + ifit(process.platform !== 'linux' && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => { // 128 MB of spaces. const chunk = new Uint8Array(128 * 1024 * 1024); chunk.fill(' '.charCodeAt(0)); diff --git a/spec/chromium-spec.ts b/spec/chromium-spec.ts index ce7f6e5023dd..e74de1aa9ed1 100644 --- a/spec/chromium-spec.ts +++ b/spec/chromium-spec.ts @@ -15,7 +15,7 @@ import * as path from 'node:path'; import { setTimeout } from 'node:timers/promises'; import * as url from 'node:url'; -import { ifit, ifdescribe, defer, itremote, listen, startRemoteControlApp } from './lib/spec-helpers'; +import { ifit, ifdescribe, defer, itremote, listen, startRemoteControlApp, waitUntil } from './lib/spec-helpers'; import { closeAllWindows } from './lib/window-helpers'; import { PipeTransport } from './pipe-transport'; @@ -2944,10 +2944,12 @@ describe('iframe using HTML fullscreen API while window is OS-fullscreened', () ); await once(w.webContents, 'leave-html-full-screen'); - const width = await w.webContents.executeJavaScript( - "document.querySelector('iframe').offsetWidth" - ); - expect(width).to.equal(0); + await expect(waitUntil(async () => { + const width = await w.webContents.executeJavaScript( + "document.querySelector('iframe').offsetWidth" + ); + return width === 0; + })).to.eventually.be.fulfilled(); w.setFullScreen(false); await once(w, 'leave-full-screen');