Skip to content

Commit

Permalink
Merge pull request #19117 from Snuffleupagus/bot-forceNoChrome
Browse files Browse the repository at this point in the history
Disable the browser-tests in Google Chrome on the bots
  • Loading branch information
Snuffleupagus authored Dec 1, 2024
2 parents 2bbf9b4 + fd31e72 commit 867aaf0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 21 deletions.
19 changes: 7 additions & 12 deletions gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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) {
Expand Down
7 changes: 0 additions & 7 deletions test/driver.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions test/test_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10829,8 +10829,7 @@
"rounds": 1,
"type": "eq",
"link": true,
"talos": false,
"noChrome": true
"talos": false
},
{
"id": "issue18956",
Expand Down

0 comments on commit 867aaf0

Please sign in to comment.