Skip to content

Commit 80f1a84

Browse files
committed
improve test run messages
1 parent 6d70ab3 commit 80f1a84

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

vscode-client/testcontrollermanager.ts

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ export class TestControllerManager {
528528
case "SKIP":
529529
run.skipped(item);
530530
break;
531-
case "FAIL":
531+
default:
532532
{
533533
const messages: vscode.TestMessage[] = [];
534534

@@ -548,7 +548,11 @@ export class TestControllerManager {
548548

549549
messages.push(message);
550550
}
551-
} else {
551+
}
552+
if (
553+
!event.attributes?.message ||
554+
!event.failedKeywords?.find((v) => v.message === event.attributes?.message)
555+
) {
552556
const message = new vscode.TestMessage(event.attributes.message ?? "unknown error");
553557

554558
if (event.attributes.source) {
@@ -562,19 +566,12 @@ export class TestControllerManager {
562566
}
563567
messages.push(message);
564568
}
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);
576574
}
577-
run.errored(item, message, event.attributes.elapsedtime);
578575
}
579576
break;
580577
}
@@ -606,7 +603,7 @@ export class TestControllerManager {
606603
// event.itemId !== undefined ? this.findTestItemById(event.itemId) : undefined
607604
// );
608605

609-
run.appendOutput(`${event.level}: ${event.message}` + "\r\n");
606+
run.appendOutput(`${event.level}: ${event.message.replaceAll("\n", "\r\n")}` + "\r\n");
610607
}
611608
}
612609
}

0 commit comments

Comments
 (0)