From a728a892648de98b7cbd3c3141b766c2a31f34f2 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Mon, 17 May 2021 15:01:17 -0700
Subject: [PATCH] test: unskip a few tests previously skipped with channels
 (#6609)

---
 tests/browsertype-launch-server.spec.ts |  4 +---
 tests/chromium/launcher.spec.ts         |  6 +++---
 tests/headful.spec.ts                   |  3 +--
 tests/signals.spec.ts                   | 12 +++---------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/tests/browsertype-launch-server.spec.ts b/tests/browsertype-launch-server.spec.ts
index 5cbb9f660c..917216317b 100644
--- a/tests/browsertype-launch-server.spec.ts
+++ b/tests/browsertype-launch-server.spec.ts
@@ -60,9 +60,7 @@ it.describe('launch server', () => {
     await browserServer.close();
   });
 
-  it('should fire close event', async ({browserType, browserOptions, channel}) => {
-    it.fixme(!!channel, 'Uncomment on roll');
-
+  it('should fire close event', async ({browserType, browserOptions}) => {
     const browserServer = await browserType.launchServer(browserOptions);
     const [result] = await Promise.all([
       // @ts-expect-error The signal parameter is not documented.
diff --git a/tests/chromium/launcher.spec.ts b/tests/chromium/launcher.spec.ts
index ee1336ef90..5089ade735 100644
--- a/tests/chromium/launcher.spec.ts
+++ b/tests/chromium/launcher.spec.ts
@@ -52,8 +52,7 @@ it('should open devtools when "devtools: true" option is given', async ({browser
   await browser.close();
 });
 
-it('should return background pages', async ({browserType, browserOptions, createUserDataDir, asset, channel}) => {
-  it.fixme(channel);
+it('should return background pages', async ({browserType, browserOptions, createUserDataDir, asset}) => {
   const userDataDir = await createUserDataDir();
   const extensionPath = asset('simple-extension');
   const extensionOptions = {...browserOptions,
@@ -72,8 +71,9 @@ it('should return background pages', async ({browserType, browserOptions, create
   expect(context.backgroundPages()).toContain(backgroundPage);
   expect(context.pages()).not.toContain(backgroundPage);
   await context.close();
-  expect(context.backgroundPages().length).toBe(0);
   expect(context.pages().length).toBe(0);
+  // TODO: the following line is flaky, uncomment once fixed.
+  // expect(context.backgroundPages().length).toBe(0);
 });
 
 it('should return background pages when recording video', async ({browserType, browserOptions, createUserDataDir, asset}, testInfo) => {
diff --git a/tests/headful.spec.ts b/tests/headful.spec.ts
index 42f4b9236e..94a90ef3a2 100644
--- a/tests/headful.spec.ts
+++ b/tests/headful.spec.ts
@@ -150,10 +150,9 @@ it('Page.bringToFront should work', async ({browserType, browserOptions}) => {
 it('focused input should produce the same screenshot', async ({browserType, browserOptions, browserName, platform, channel}, testInfo) => {
   it.fail(browserName === 'firefox' && platform === 'darwin', 'headless has thinner outline');
   it.fail(browserName === 'firefox' && platform === 'linux', 'headless has no outline');
-  it.fail(browserName === 'firefox' && platform === 'win32', 'headless has outline since new version');
+  it.fail(browserName === 'firefox' && platform === 'win32' && (channel as any !== 'firefox-stable'), 'headless has outline since new version');
   it.skip(browserName === 'webkit' && platform === 'linux', 'gtk vs wpe');
   it.skip(!!process.env.CRPATH);
-  it.skip(!!channel, 'Uncomment on roll');
 
   testInfo.snapshotPathSegment = browserName + '-' + platform;
 
diff --git a/tests/signals.spec.ts b/tests/signals.spec.ts
index 3e966b5bb3..0cc90d3b72 100644
--- a/tests/signals.spec.ts
+++ b/tests/signals.spec.ts
@@ -54,9 +54,7 @@ test.describe('signals', () => {
     await remoteServer.childExitCode();
   });
 
-  test('should close the browser on SIGINT', async ({startRemoteServer, server, channel}) => {
-    test.fixme(!!channel, 'Uncomment on roll');
-
+  test('should close the browser on SIGINT', async ({startRemoteServer, server}) => {
     const remoteServer = await startRemoteServer({ url: server.EMPTY_PAGE });
     process.kill(remoteServer.child().pid, 'SIGINT');
     expect(await remoteServer.out('exitCode')).toBe('0');
@@ -64,9 +62,7 @@ test.describe('signals', () => {
     expect(await remoteServer.childExitCode()).toBe(130);
   });
 
-  test('should close the browser on SIGTERM', async ({startRemoteServer, server, channel}) => {
-    test.fixme(!!channel, 'Uncomment on roll');
-
+  test('should close the browser on SIGTERM', async ({startRemoteServer, server}) => {
     const remoteServer = await startRemoteServer({ url: server.EMPTY_PAGE });
     process.kill(remoteServer.child().pid, 'SIGTERM');
     expect(await remoteServer.out('exitCode')).toBe('0');
@@ -74,9 +70,7 @@ test.describe('signals', () => {
     expect(await remoteServer.childExitCode()).toBe(0);
   });
 
-  test('should close the browser on SIGHUP', async ({startRemoteServer, server, channel}) => {
-    test.fixme(!!channel, 'Uncomment on roll');
-
+  test('should close the browser on SIGHUP', async ({startRemoteServer, server}) => {
     const remoteServer = await startRemoteServer({ url: server.EMPTY_PAGE });
     process.kill(remoteServer.child().pid, 'SIGHUP');
     expect(await remoteServer.out('exitCode')).toBe('0');