@@ -144,7 +144,7 @@ exports.Server = function Server(bsClient, workers) {
144144 if ( details . message ) {
145145 output += ", " + details . message ;
146146 }
147- if ( details . actual && details . expected ) {
147+ if ( details . actual != null && details . expected != null ) {
148148 output += "\n" + chalk . blue ( "Expected: " ) + details . expected +
149149 "\n" + chalk . blue ( " Actual: " ) + details . actual ;
150150 }
@@ -187,7 +187,7 @@ exports.Server = function Server(bsClient, workers) {
187187 "_progress" : function progressHandler ( uri , body , request , response ) {
188188 var uuid = request . headers [ 'x-worker-uuid' ] ;
189189 var worker = workers [ uuid ] || { } ;
190- query = "" ;
190+ var query = null ;
191191 try {
192192 query = parseBody ( body ) ;
193193 } catch ( e ) {
@@ -197,14 +197,14 @@ exports.Server = function Server(bsClient, workers) {
197197
198198 if ( query . tracebacks ) {
199199 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 ) ) ;
201201 } ) ;
202202 }
203203 response . end ( ) ;
204204 } ,
205205
206206 "_report" : function reportHandler ( uri , body , request , response ) {
207- query = null ;
207+ var query = null ;
208208 try {
209209 query = parseBody ( body ) ;
210210 } catch ( e ) { }
@@ -216,20 +216,21 @@ exports.Server = function Server(bsClient, workers) {
216216 logger . info ( "[%s] Null response from remote Browser" , request . headers [ 'x-browser-string' ] ) ;
217217 } else {
218218 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 ) ) ;
220220 query . tracebacks . forEach ( function ( traceback ) {
221221 logger . info ( traceback ) ;
222222 } ) ;
223223 }
224224 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 ) ;
226226 config . status += query . failed ;
227227 }
228228
229+ // TODO remove this check, must always be true due to `worker` usage above
229230 if ( worker ) {
230231 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 ) ;
233234 }
234235
235236 checkAndTerminateWorker ( worker , function ( reusedWorker ) {
0 commit comments