@@ -144,7 +144,7 @@ exports.Server = function Server(bsClient, workers) {
144
144
if ( details . message ) {
145
145
output += ", " + details . message ;
146
146
}
147
- if ( details . actual && details . expected ) {
147
+ if ( details . actual != null && details . expected != null ) {
148
148
output += "\n" + chalk . blue ( "Expected: " ) + details . expected +
149
149
"\n" + chalk . blue ( " Actual: " ) + details . actual ;
150
150
}
@@ -187,7 +187,7 @@ exports.Server = function Server(bsClient, workers) {
187
187
"_progress" : function progressHandler ( uri , body , request , response ) {
188
188
var uuid = request . headers [ 'x-worker-uuid' ] ;
189
189
var worker = workers [ uuid ] || { } ;
190
- query = "" ;
190
+ var query = null ;
191
191
try {
192
192
query = parseBody ( body ) ;
193
193
} catch ( e ) {
@@ -197,14 +197,14 @@ exports.Server = function Server(bsClient, workers) {
197
197
198
198
if ( query . tracebacks ) {
199
199
query . tracebacks . forEach ( function ( traceback ) {
200
- logger . info ( chalk . red ( "[%s] Error:" ) , getTestBrowserInfo ( worker ) , formatTraceback ( traceback ) ) ;
200
+ logger . info ( "[%s] " + chalk . red ( " Error:") , getTestBrowserInfo ( worker ) , formatTraceback ( traceback ) ) ;
201
201
} ) ;
202
202
}
203
203
response . end ( ) ;
204
204
} ,
205
205
206
206
"_report" : function reportHandler ( uri , body , request , response ) {
207
- query = null ;
207
+ var query = null ;
208
208
try {
209
209
query = parseBody ( body ) ;
210
210
} catch ( e ) { }
@@ -216,20 +216,21 @@ exports.Server = function Server(bsClient, workers) {
216
216
logger . info ( "[%s] Null response from remote Browser" , request . headers [ 'x-browser-string' ] ) ;
217
217
} else {
218
218
if ( query . tracebacks && query . tracebacks . length > 0 ) {
219
- logger . info ( chalk [ "red" ] ( "[%s] Tracebacks:" ) , getTestBrowserInfo ( worker ) ) ;
219
+ logger . info ( "[%s] " + chalk [ "red" ] ( "Tracebacks:" ) , getTestBrowserInfo ( worker ) ) ;
220
220
query . tracebacks . forEach ( function ( traceback ) {
221
221
logger . info ( traceback ) ;
222
222
} ) ;
223
223
}
224
224
var color = query . failed ? "red" : "green" ;
225
- logger . info ( chalk [ color ] ( "[%s] Completed in %d milliseconds. %d of %d passed, %d failed." ) , getTestBrowserInfo ( worker ) , query . runtime , query . passed , query . total , query . failed ) ;
225
+ logger . info ( "[%s] " + chalk [ color ] ( query . failed ? "Failed:" : "Passed:" ) + " %d tests, %d passed, %d failed; ran for %dms" , getTestBrowserInfo ( worker ) , query . total , query . passed , query . failed , query . runtime ) ;
226
226
config . status += query . failed ;
227
227
}
228
228
229
+ // TODO remove this check, must always be true due to `worker` usage above
229
230
if ( worker ) {
230
231
bsClient . takeScreenshot ( worker . id , function ( error , screenshot ) {
231
- if ( ! error && screenshot . url ) {
232
- logger . info ( '[%s] ' + chalk [ ' yellow' ] ( 'Screenshot' ) + ': %s' , getTestBrowserInfo ( worker ) , screenshot . url ) ;
232
+ if ( ! error && screenshot . url && query && query . failed ) {
233
+ logger . info ( '[%s] ' + chalk . yellow ( 'Screenshot: ' ) + ' %s' , getTestBrowserInfo ( worker ) , screenshot . url ) ;
233
234
}
234
235
235
236
checkAndTerminateWorker ( worker , function ( reusedWorker ) {
0 commit comments