From 9adcdabd6592e05d0196119deaaf642480a14a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Wed, 26 Feb 2020 20:33:18 +0100
Subject: stream output of js unit tests (#4146)

---
 cli/js/test_util.ts        | 27 +++++++++++++--------------
 cli/js/unit_test_runner.ts |  4 ++--
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'cli/js')

diff --git a/cli/js/test_util.ts b/cli/js/test_util.ts
index 3e089486b..b8ae3ca93 100644
--- a/cli/js/test_util.ts
+++ b/cli/js/test_util.ts
@@ -7,6 +7,7 @@
 // tests by the special string. permW1N0 means allow-write but not allow-net.
 // See tools/unit_tests.py for more details.
 
+import { readLines } from "../../std/io/bufio.ts";
 import { assert, assertEquals } from "../../std/testing/asserts.ts";
 export {
   assert,
@@ -140,16 +141,13 @@ function extractNumber(re: RegExp, str: string): number | undefined {
   }
 }
 
-export function parseUnitTestOutput(
-  rawOutput: Uint8Array,
+export async function parseUnitTestOutput(
+  reader: Deno.Reader,
   print: boolean
-): { actual?: number; expected?: number; resultOutput?: string } {
-  const decoder = new TextDecoder();
-  const output = decoder.decode(rawOutput);
-
+): Promise<{ actual?: number; expected?: number; resultOutput?: string }> {
   let expected, actual, result;
 
-  for (const line of output.split("\n")) {
+  for await (const line of readLines(reader)) {
     if (!expected) {
       // expect "running 30 tests"
       expected = extractNumber(/running (\d+) tests/, line);
@@ -267,31 +265,32 @@ testPerm({ read: true }, async function parsingUnitTestOutput(): Promise<void> {
   let result;
 
   // This is an example of a successful unit test output.
-  result = parseUnitTestOutput(
-    await Deno.readFile(`${testDataPath}/unit_test_output1.txt`),
+  result = await parseUnitTestOutput(
+    await Deno.open(`${testDataPath}/unit_test_output1.txt`),
     false
   );
   assertEquals(result.actual, 96);
   assertEquals(result.expected, 96);
 
   // This is an example of a silently dying unit test.
-  result = parseUnitTestOutput(
-    await Deno.readFile(`${testDataPath}/unit_test_output2.txt`),
+  result = await parseUnitTestOutput(
+    await Deno.open(`${testDataPath}/unit_test_output2.txt`),
     false
   );
   assertEquals(result.actual, undefined);
   assertEquals(result.expected, 96);
 
   // This is an example of compiling before successful unit tests.
-  result = parseUnitTestOutput(
-    await Deno.readFile(`${testDataPath}/unit_test_output3.txt`),
+  result = await parseUnitTestOutput(
+    await Deno.open(`${testDataPath}/unit_test_output3.txt`),
     false
   );
   assertEquals(result.actual, 96);
   assertEquals(result.expected, 96);
 
   // Check what happens on empty output.
-  result = parseUnitTestOutput(new TextEncoder().encode("\n\n\n"), false);
+  const f = new Deno.Buffer(new TextEncoder().encode("\n\n\n"));
+  result = await parseUnitTestOutput(f, false);
   assertEquals(result.actual, undefined);
   assertEquals(result.expected, undefined);
 });
diff --git a/cli/js/unit_test_runner.ts b/cli/js/unit_test_runner.ts
index dd095058f..f32de96f8 100755
--- a/cli/js/unit_test_runner.ts
+++ b/cli/js/unit_test_runner.ts
@@ -61,8 +61,8 @@ async function main(): Promise<void> {
       stdout: "piped"
     });
 
-    const { actual, expected, resultOutput } = parseUnitTestOutput(
-      await p.output(),
+    const { actual, expected, resultOutput } = await parseUnitTestOutput(
+      p.stdout!,
       true
     );
 
-- 
cgit v1.2.3