@@ -528,7 +528,7 @@ export class TestControllerManager {
528
528
case "SKIP" :
529
529
run . skipped ( item ) ;
530
530
break ;
531
- case "FAIL" :
531
+ default :
532
532
{
533
533
const messages : vscode . TestMessage [ ] = [ ] ;
534
534
@@ -548,7 +548,11 @@ export class TestControllerManager {
548
548
549
549
messages . push ( message ) ;
550
550
}
551
- } else {
551
+ }
552
+ if (
553
+ ! event . attributes ?. message ||
554
+ ! event . failedKeywords ?. find ( ( v ) => v . message === event . attributes ?. message )
555
+ ) {
552
556
const message = new vscode . TestMessage ( event . attributes . message ?? "unknown error" ) ;
553
557
554
558
if ( event . attributes . source ) {
@@ -562,19 +566,12 @@ export class TestControllerManager {
562
566
}
563
567
messages . push ( message ) ;
564
568
}
565
- run . failed ( item , messages , event . attributes . elapsedtime ) ;
566
- }
567
- break ;
568
- default :
569
- {
570
- const message = new vscode . TestMessage ( event . attributes . message ?? "unknown error" ) ;
571
- if ( event . attributes . source !== undefined ) {
572
- message . location = new vscode . Location (
573
- vscode . Uri . file ( event . attributes . source ) ,
574
- new vscode . Position ( ( event . attributes . lineno ?? 1 ) - 1 , 0 )
575
- ) ;
569
+
570
+ if ( event . attributes . status === "FAIL" ) {
571
+ run . failed ( item , messages , event . attributes . elapsedtime ) ;
572
+ } else {
573
+ run . errored ( item , messages , event . attributes . elapsedtime ) ;
576
574
}
577
- run . errored ( item , message , event . attributes . elapsedtime ) ;
578
575
}
579
576
break ;
580
577
}
@@ -606,7 +603,7 @@ export class TestControllerManager {
606
603
// event.itemId !== undefined ? this.findTestItemById(event.itemId) : undefined
607
604
// );
608
605
609
- run . appendOutput ( `${ event . level } : ${ event . message } ` + "\r\n" ) ;
606
+ run . appendOutput ( `${ event . level } : ${ event . message . replaceAll ( "\n" , "\r\n" ) } ` + "\r\n" ) ;
610
607
}
611
608
}
612
609
}
0 commit comments