From fd31e728f75d8c697feabc2d6599a1d8693709db Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 27 Nov 2024 17:51:32 +0100
Subject: [PATCH] Disable the browser-tests in Google Chrome on the bots

Given that `browsertest` repeatedly timeout in Google Chrome, and considering that Firefox is the primary development target, we stop running them on the bots to avoid having to repeatedly deal with this.

Note that we already disabled these tests *on Windows* almost three years ago, because of stability issues; see PR 14392.
---
 gulpfile.mjs            | 19 +++++++------------
 test/driver.js          |  7 -------
 test/test_manifest.json |  3 +--
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/gulpfile.mjs b/gulpfile.mjs
index 403d606fee8d8..2ecbc98e7c63d 100644
--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@@ -686,12 +686,9 @@ function runTests(testsName, { bot = false, xfaOnly = false } = {}) {
         if (!bot) {
           args.push("--reftest");
         } else {
-          const os = process.env.OS;
-          if (/windows/i.test(os)) {
-            // The browser-tests are too slow in Google Chrome on the Windows
-            // bot, causing a timeout, hence disabling them for now.
-            forceNoChrome = true;
-          }
+          // The browser-tests are too slow in Google Chrome on the bots,
+          // causing a timeout, hence disabling them for now.
+          forceNoChrome = true;
         }
         if (xfaOnly) {
           args.push("--xfaOnly");
@@ -770,12 +767,10 @@ function makeRef(done, bot) {
   let forceNoChrome = false;
   const args = ["test.mjs", "--masterMode"];
   if (bot) {
-    const os = process.env.OS;
-    if (/windows/i.test(os)) {
-      // The browser-tests are too slow in Google Chrome on the Windows
-      // bot, causing a timeout, hence disabling them for now.
-      forceNoChrome = true;
-    }
+    // The browser-tests are too slow in Google Chrome on the bots,
+    // causing a timeout, hence disabling them for now.
+    forceNoChrome = true;
+
     args.push("--noPrompts", "--strictVerify");
   }
   if (process.argv.includes("--noChrome") || forceNoChrome) {
diff --git a/test/driver.js b/test/driver.js
index 8991e50ab6771..fcdfd787d5215 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -609,13 +609,6 @@ class Driver {
         return;
       }
 
-      if (task.noChrome && window?.chrome) {
-        this._log(`Skipping file "${task.file}" (because on Chrome)\n`);
-        this.currentTask++;
-        this._nextTask();
-        return;
-      }
-
       this._log('Loading file "' + task.file + '"\n');
 
       try {
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 0b6dcc6cdc004..eaf376756ead4 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -10749,8 +10749,7 @@
     "rounds": 1,
     "type": "eq",
     "link": true,
-    "talos": false,
-    "noChrome": true
+    "talos": false
   },
   {
     "id": "issue18956",