From 59aab3676d308e0f6c9aefc8bd219696535a89c6 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 29 May 2020 17:50:11 +0100 Subject: [PATCH] Revert "testing: New chrome testing hack slash workaround (#4055)" (#4057) This reverts commit 59b54b4772006b25916c729c764605df9b3e0fdb. --- tests/frontend/specs/automatic_reconnect.js | 2 -- tests/frontend/travis/remote_runner.js | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/frontend/specs/automatic_reconnect.js b/tests/frontend/specs/automatic_reconnect.js index bc8ef5eb1..e2d2df36a 100644 --- a/tests/frontend/specs/automatic_reconnect.js +++ b/tests/frontend/specs/automatic_reconnect.js @@ -1,4 +1,3 @@ -/* describe('Automatic pad reload on Force Reconnect message', function() { var padId, $originalPadFrame; @@ -70,4 +69,3 @@ describe('Automatic pad reload on Force Reconnect message', function() { }); }); }); -*/ diff --git a/tests/frontend/travis/remote_runner.js b/tests/frontend/travis/remote_runner.js index 1bef600a4..7fc990c70 100644 --- a/tests/frontend/travis/remote_runner.js +++ b/tests/frontend/travis/remote_runner.js @@ -73,21 +73,17 @@ var sauceTestWorker = async.queue(function (testSettings, callback) { }, 5); //run 5 tests in parrallel // 1) Firefox on Linux -/* sauceTestWorker.push({ 'platform' : 'Linux' , 'browserName' : 'firefox' , 'version' : 'latest' }); -*/ - // 2) Chrome on Linux sauceTestWorker.push({ 'platform' : 'Linux' , 'browserName' : 'googlechrome' , 'version' : 'latest' }); -/* // 3) Safari on OSX 10.15 sauceTestWorker.push({ 'platform' : 'OS X 10.15' @@ -106,7 +102,7 @@ sauceTestWorker.push({ , 'browserName' : 'microsoftedge' , 'version' : 'latest' }); -*/ + sauceTestWorker.drain = function() { setTimeout(function(){ process.exit(allTestsPassed ? 0 : 1);