mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-28 03:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'remoterunner-fix' into saucelabs-parallel

Browse source
This commit is contained in:
webzwo0i 2020-07-11 08:07:29 +02:00
commit e676b12eb2
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/frontend/travis/remote_runner.js
View file

@ -17,9 +17,9 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
testSettings.name = name;
testSettings["public"] = true;
testSettings["build"] = process.env.GIT_HASH;
testSettings["extendedDebugging"] = true; // console.json can be downloaded via saucelabs, don't know how to print them into output of the tests
testSettings["tunnelIdentifier"] = process.env.TRAVIS_JOB_NUMBER;
// we wait 10 seconds here with the hope it was enough time for the minified files to be built etc.
setTimeout(function(){
browser.init(testSettings).get("http://localhost:9001/tests/frontend/", function(){
var url = "https://saucelabs.com/jobs/" + browser.sessionID;
console.log("Remote sauce test '" + name + "' started! " + url);
@ -38,7 +38,7 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
var testResult = knownConsoleText.replace(/\[red\]/g,'\x1B[31m').replace(/\[yellow\]/g,'\x1B[33m')
.replace(/\[green\]/g,'\x1B[32m').replace(/\[clear\]/g, '\x1B[39m');
testResult = testResult.split("\\n").map(function(line){
return "[" + testSettings.browserName + (testSettings.version === "" ? '' : (" " + testSettings.version)) + "] " + line;
return "[" + testSettings.browserName + " " + testSettings.platform + (testSettings.version === "" ? '' : (" " + testSettings.version)) + "] " + line;
}).join("\n");
console.log(testResult);
@ -47,7 +47,10 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
callback();
}
//timeout for the case the test hangs
/**
* timeout for the case the test hangs
* @todo this should be configured in testSettings, see https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options#TestConfigurationOptions-Timeouts
*/
var timeout = setTimeout(function(){
stopSauce(false);
}, 1200000 * 10);
@ -61,16 +64,19 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
knownConsoleText = consoleText;
if(knownConsoleText.indexOf("FINISHED") > 0){
var success = knownConsoleText.indexOf("FAILED") === -1;
stopSauce(success);
let match = knownConsoleText.match(/FINISHED - ([0-9]+) tests passed, ([0-9]+) tests failed/);
if (match[2] && match[2] == 0){
stopSauce(true);
}
else {
stopSauce(false);
}
}
});
}, 5000);
});
}, 10000);
}, 1); //run 1 test in parrallel
}, 4); //run 4 test in parrallel
// Firefox on Linux
sauceTestWorker.push({