From e679b82339b2dd47d60f6bca35620ce1ba49ce14 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Thu, 20 Aug 2020 00:04:52 +0200
Subject: [PATCH] fix(devops): auto roll tests (#3536)

---
 .github/workflows/auto_roll.yml | 3 +--
 test/base.fixture.ts            | 3 ---
 test/browsertype-basic.spec.ts  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/auto_roll.yml b/.github/workflows/auto_roll.yml
index 18df9d6cee..082eb036fc 100644
--- a/.github/workflows/auto_roll.yml
+++ b/.github/workflows/auto_roll.yml
@@ -27,12 +27,11 @@ jobs:
     # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
     # Wrap `npm run` in a subshell to redirect STDERR to file.
     # Enable core dumps in the subshell.
-    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && node test/runner test/ --jobs=1 --forbid-only --timeout=30000 && npm run coverage"
+    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "ulimit -c unlimited && node test/runner test/ --jobs=1 --forbid-only --timeout=30000"
       env:
         BROWSER: ${{ matrix.browser }}
         DEBUG: "pw:*,-pw:wrapped*,-pw:test*"
         DEBUG_FILE: "testrun.log"
-        PWCHANNEL: none
         FFPATH: ${{ steps.build-browser.outputs.FFPATH }}
         WKPATH: ${{ steps.build-browser.outputs.WKPATH }}
     - uses: actions/upload-artifact@v1
diff --git a/test/base.fixture.ts b/test/base.fixture.ts
index f6c3f31a00..522bae60b3 100644
--- a/test/base.fixture.ts
+++ b/test/base.fixture.ts
@@ -152,9 +152,6 @@ registerFixture('toImpl', async ({playwright}, test) => {
 
 registerWorkerFixture('browserType', async ({playwright, browserName}, test) => {
   const browserType = playwright[browserName];
-  const executablePath = getExecutablePath(browserName)
-  if (executablePath)
-    browserType._executablePath = executablePath
   await test(browserType);
 });
 
diff --git a/test/browsertype-basic.spec.ts b/test/browsertype-basic.spec.ts
index e2f3ac916a..8510a5ec49 100644
--- a/test/browsertype-basic.spec.ts
+++ b/test/browsertype-basic.spec.ts
@@ -18,7 +18,7 @@
 import fs from 'fs';
 import './base.fixture';
 
-it('browserType.executablePath should work', async({browserType}) => {
+it.skip(Boolean(process.env.CRPATH || process.env.FFPATH || process.env.WKPATH))('browserType.executablePath should work', async({browserType}) => {
   const executablePath = browserType.executablePath();
   expect(fs.existsSync(executablePath)).toBe(true);
   expect(fs.realpathSync(executablePath)).toBe(executablePath);