1
0
forked from rosa/hakurei

cmd/pkgserver: serialize raw log list for go test consumption

This commit is contained in:
Kat
2026-03-20 18:47:03 +11:00
parent 7fa87e69fe
commit e0f32ead04

View File

@@ -35,11 +35,11 @@ function checkDuplicates(parent: string, names: { name: string }[]) {
class FailNowSentinel {}
export class TestController {
#logBuf: string[];
logs: string[];
#failed: boolean;
constructor() {
this.#logBuf = [];
this.logs = [];
this.#failed = false;
}
@@ -57,7 +57,7 @@ export class TestController {
}
log(message: string) {
this.#logBuf.push(message);
this.logs.push(message);
}
error(message: string) {
@@ -69,10 +69,6 @@ export class TestController {
this.log(message);
this.failNow();
}
getLog(): string {
return this.#logBuf.join("\n");
}
}
// =============================================================================
@@ -80,7 +76,7 @@ export class TestController {
export interface TestResult {
success: boolean;
output: string;
logs: string[];
}
export function run(reporter: Reporter) {
@@ -105,7 +101,7 @@ function runTests(reporter: Reporter, parents: string[], node: TestTree) {
controller.error(extractExceptionString(e));
}
}
reporter.update(path, { success: !controller.failed(), output: controller.getLog() });
reporter.update(path, { success: !controller.failed(), logs: controller.logs });
}
function extractExceptionString(e: any): string {
@@ -192,10 +188,13 @@ export class StreamReporter implements Reporter {
#writeOutput(test: { name: string } & TestResult, prefix: string, nested: boolean) {
let output = "";
if (test.output) {
const lines = test.output.split("\n");
if (test.logs.length) {
// Individual logs might span multiple lines, so join them together
// then split it again.
const logStr = test.logs.join("\n");
const lines = logStr.split("\n");
if (lines.length <= 1) {
output = `: ${test.output}`;
output = `: ${logStr}`;
} else {
const padding = nested ? " " : " ";
output = ":\n" + lines.map((line) => padding + line).join("\n");
@@ -239,9 +238,9 @@ export class DOMReporter implements Reporter {
}
const p = document.createElement("p");
p.classList.add("test-desc");
if (result.output) {
if (result.logs.length) {
const pre = document.createElement("pre");
pre.appendChild(document.createTextNode(result.output));
pre.appendChild(document.createTextNode(result.logs.join("\n")));
p.appendChild(pre);
} else {
p.classList.add("italic");