Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-11 19:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use result job_id instead of parsing the url and ensure tunnel can restart if the tunnel failed to start.

Browse Source
This commit is contained in:
John-David Dalton
2014-05-14 22:29:17 -07:00
parent cd838d4902
commit 7152308c25
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/saucelabs.js
View File

@@ -389,14 +389,15 @@ function onJobStart(error, res, body) {
function onJobStatus(error, res, body) { function onJobStatus(error, res, body) {
var completed = _.result(body, 'completed'), var completed = _.result(body, 'completed'),
data = _.first(_.result(body, 'js tests')), data = _.first(_.result(body, 'js tests')),
jobResult = _.result(data, 'result'), jobId = _.result(data, 'job_id', null),
jobStatus = _.result(data, 'status'), jobResult = _.result(data, 'result', null),
jobUrl = _.result(data, 'url'), jobStatus = _.result(data, 'status', ''),
jobUrl = _.result(data, 'url', null),
options = this.options, options = this.options,
platform = options.platforms[0], platform = options.platforms[0],
description = browserName(platform[1]) + ' ' + platform[2] + ' on ' + capitalizeWords(platform[0]), description = browserName(platform[1]) + ' ' + platform[2] + ' on ' + capitalizeWords(platform[0]),
elapsed = (_.now() - this.timestamp) / 1000, elapsed = (_.now() - this.timestamp) / 1000,
expired = (jobStatus != 'test session in progress' && elapsed >= queueTimeout), expired = (elapsed >= queueTimeout && !_.contains(jobStatus, 'in progress')),
failures = _.result(jobResult, 'failed'), failures = _.result(jobResult, 'failed'),
label = options.name + ':', label = options.name + ':',
tunnel = this.tunnel; tunnel = this.tunnel;
@@ -405,16 +406,15 @@ function onJobStatus(error, res, body) {
if (!this.running || this.stopping) { if (!this.running || this.stopping) {
return; return;
} }
this.id = jobId;
this.result = jobResult;
this.url = jobUrl;
this.emit('status', jobStatus); this.emit('status', jobStatus);
if (jobUrl) {
this.id = _.last(url.parse(jobUrl).pathname.split('/'));
this.url = jobUrl;
}
if (!completed && !expired) { if (!completed && !expired) {
this._pollerId = _.delay(_.bind(this.status, this), this.statusInterval * 1000); this._pollerId = _.delay(_.bind(this.status, this), this.statusInterval * 1000);
return; return;
} }
this.result = jobResult;
if (!jobResult || failures || reError.test(jobResult.message)) { if (!jobResult || failures || reError.test(jobResult.message)) {
if (this.attempts < this.retries) { if (this.attempts < this.retries) {
this.restart(); this.restart();
@@ -517,9 +517,8 @@ Job.prototype.remove = function(callback) {
return this; return this;
} }
this.removing = true; this.removing = true;
var onRemove = _.bind(onJobRemove, this);
return this.stop(function() { return this.stop(function() {
var onRemove = _.bind(onJobRemove, this);
if (this.id == null) { if (this.id == null) {
onRemove(); onRemove();
return; return;
@@ -819,8 +818,14 @@ Tunnel.prototype.stop = function(callback) {
var jobs = this.jobs, var jobs = this.jobs,
active = jobs.active; active = jobs.active;
var onStop = _.bind(onGenericStop, this), var stop = _.after(active.length, _.bind(function() {
stop = _.after(active.length, _.bind(this.connection.stop, this.connection, onStop)); var onStop = _.bind(onGenericStop, this);
if (this.running) {
this.connection.stop(onStop);
} else {
onStop();
}
}, this));
jobs.queue.length = 0; jobs.queue.length = 0;
if (_.isEmpty(active)) { if (_.isEmpty(active)) {