Revert "temp replace promiseChainRemote with chain"
This reverts commit 60ca907bff
.
saucelabs-parallel
parent
3701d647a6
commit
0e945ceabd
|
@ -12,8 +12,7 @@ var config = {
|
||||||
var allTestsPassed = true;
|
var allTestsPassed = true;
|
||||||
|
|
||||||
var sauceTestWorker = async.queue(function (testSettings, callback) {
|
var sauceTestWorker = async.queue(function (testSettings, callback) {
|
||||||
var browser = wd.remote(config.host, config.port, config.username, config.accessKey);
|
var browser = wd.promiseChainRemote(config.host, config.port, config.username, config.accessKey);
|
||||||
var browserChain = browser.chain();
|
|
||||||
var name = process.env.GIT_HASH + " - " + testSettings.browserName + " " + testSettings.version + ", " + testSettings.platform;
|
var name = process.env.GIT_HASH + " - " + testSettings.browserName + " " + testSettings.version + ", " + testSettings.platform;
|
||||||
testSettings.name = name;
|
testSettings.name = name;
|
||||||
testSettings["public"] = true;
|
testSettings["public"] = true;
|
||||||
|
@ -21,7 +20,7 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
|
||||||
|
|
||||||
// we wait 10 seconds here with the hope it was enough time for the minified files to be built etc.
|
// we wait 10 seconds here with the hope it was enough time for the minified files to be built etc.
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
browserChain.init(testSettings).get("http://localhost:9001/tests/frontend/", function(){
|
browser.init(testSettings).get("http://localhost:9001/tests/frontend/", function(){
|
||||||
var url = "https://saucelabs.com/jobs/" + browser.sessionID;
|
var url = "https://saucelabs.com/jobs/" + browser.sessionID;
|
||||||
console.log("Remote sauce test '" + name + "' started! " + url);
|
console.log("Remote sauce test '" + name + "' started! " + url);
|
||||||
|
|
||||||
|
@ -30,7 +29,7 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
|
||||||
getStatusInterval && clearInterval(getStatusInterval);
|
getStatusInterval && clearInterval(getStatusInterval);
|
||||||
clearTimeout(timeout);
|
clearTimeout(timeout);
|
||||||
|
|
||||||
browserChain.quit();
|
browser.quit();
|
||||||
|
|
||||||
if(!success){
|
if(!success){
|
||||||
allTestsPassed = false;
|
allTestsPassed = false;
|
||||||
|
@ -55,7 +54,7 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
|
||||||
|
|
||||||
var knownConsoleText = "";
|
var knownConsoleText = "";
|
||||||
var getStatusInterval = setInterval(function(){
|
var getStatusInterval = setInterval(function(){
|
||||||
browserChain.eval("$('#console').text()", function(err, consoleText){
|
browser.eval("$('#console').text()", function(err, consoleText){
|
||||||
if(!consoleText || err){
|
if(!consoleText || err){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -71,7 +70,7 @@ var sauceTestWorker = async.queue(function (testSettings, callback) {
|
||||||
|
|
||||||
}, 10000);
|
}, 10000);
|
||||||
|
|
||||||
}, 8); //run 1 test in parrallel
|
}, 1); //run 1 test in parrallel
|
||||||
|
|
||||||
// Firefox on Linux
|
// Firefox on Linux
|
||||||
sauceTestWorker.push({
|
sauceTestWorker.push({
|
||||||
|
|
Loading…
Reference in New Issue