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

Add more logInline calls and move state flag assignment higher in methods.

Browse Source
This commit is contained in:
John-David Dalton
2014-05-12 21:15:13 -07:00
parent 6091219aaf
commit 6e286473ab
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/saucelabs.js
View File

@@ -423,7 +423,9 @@ function onJobStatus(error, res, body) {
var message = _.result(jobResult, 'message', 'no results available. ' + details); var message = _.result(jobResult, 'message', 'no results available. ' + details);
console.error(label, description, chalk.red('failed') + ';', message); console.error(label, description, chalk.red('failed') + ';', message);
} }
} else { }
else {
logInline();
console.log(label, description, chalk.green('passed')); console.log(label, description, chalk.green('passed'));
} }
this.running = false; this.running = false;
@@ -443,9 +445,11 @@ function onTunnelStart(success) {
this.restart(); this.restart();
return; return;
} }
logInline();
console.error('Failed to open Sauce Connect tunnel'); console.error('Failed to open Sauce Connect tunnel');
process.exit(2); process.exit(2);
} }
logInline();
console.log('Sauce Connect tunnel opened'); console.log('Sauce Connect tunnel opened');
var jobs = this.jobs; var jobs = this.jobs;
@@ -545,6 +549,8 @@ Job.prototype.restart = function(callback) {
if (this.restarting) { if (this.restarting) {
return this; return this;
} }
this.restarting = true;
var options = this.options, var 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]),
@@ -553,7 +559,6 @@ Job.prototype.restart = function(callback) {
logInline(); logInline();
console.log(label + ' ' + description + ' restart %d of %d', ++this.attempts, this.retries); console.log(label + ' ' + description + ' restart %d of %d', ++this.attempts, this.retries);
this.restarting = true;
return this.remove(onGenericRestart); return this.remove(onGenericRestart);
}; };
@@ -710,11 +715,11 @@ Tunnel.prototype.restart = function(callback) {
if (this.restarting) { if (this.restarting) {
return this; return this;
} }
this.restarting = true;
logInline(); logInline();
console.log('Tunnel ' + this.id + ': restart %d of %d', ++this.attempts, this.retries); console.log('Tunnel ' + this.id + ': restart %d of %d', ++this.attempts, this.retries);
this.restarting = true;
var jobs = this.jobs, var jobs = this.jobs,
active = jobs.active, active = jobs.active,
all = jobs.all; all = jobs.all;
@@ -745,11 +750,15 @@ Tunnel.prototype.restart = function(callback) {
*/ */
Tunnel.prototype.start = function(callback) { Tunnel.prototype.start = function(callback) {
this.once('start', _.callback(callback)); this.once('start', _.callback(callback));
if (!(this.starting || this.running)) { if (this.starting || this.running) {
console.log('Opening Sauce Connect tunnel...'); return this;
this.starting = true;
this.connection.start(_.bind(onTunnelStart, this));
} }
this.starting = true;
logInline();
console.log('Opening Sauce Connect tunnel...');
this.connection.start(_.bind(onTunnelStart, this));
return this; return this;
}; };
@@ -783,6 +792,9 @@ Tunnel.prototype.stop = function(callback) {
if (this.stopping) { if (this.stopping) {
return this; return this;
} }
this.stopping = true;
logInline();
console.log('Shutting down Sauce Connect tunnel...'); console.log('Shutting down Sauce Connect tunnel...');
var jobs = this.jobs, var jobs = this.jobs,
@@ -791,9 +803,7 @@ Tunnel.prototype.stop = function(callback) {
var onStop = _.bind(onGenericStop, this), var onStop = _.bind(onGenericStop, this),
stop = _.after(active.length, _.bind(this.connection.stop, this.connection, onStop)); stop = _.after(active.length, _.bind(this.connection.stop, this.connection, onStop));
this.stopping = true;
jobs.queue.length = 0; jobs.queue.length = 0;
if (_.isEmpty(active)) { if (_.isEmpty(active)) {
_.defer(stop); _.defer(stop);
} }