summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/js/lib.deno.ns.d.ts18
-rw-r--r--cli/js/testing.ts105
-rw-r--r--cli/js/tests/README.md56
-rw-r--r--cli/js/tests/test_util.ts20
-rwxr-xr-xcli/js/tests/unit_test_runner.ts28
-rw-r--r--cli/tests/057_revoke_permissions.out16
-rw-r--r--cli/tests/compiler_api_test.out27
-rw-r--r--cli/tests/workers_test.out10
8 files changed, 157 insertions, 123 deletions
diff --git a/cli/js/lib.deno.ns.d.ts b/cli/js/lib.deno.ns.d.ts
index 2c3a9aef4..e700c286e 100644
--- a/cli/js/lib.deno.ns.d.ts
+++ b/cli/js/lib.deno.ns.d.ts
@@ -56,7 +56,8 @@ declare namespace Deno {
export enum TestEvent {
Start = "start",
- Result = "result",
+ TestStart = "testStart",
+ TestEnd = "testEnd",
End = "end"
}
@@ -65,8 +66,13 @@ declare namespace Deno {
tests: number;
}
- interface TestEventResult {
- kind: TestEvent.Result;
+ interface TestEventTestStart {
+ kind: TestEvent.TestStart;
+ name: string;
+ }
+
+ interface TestEventTestEnd {
+ kind: TestEvent.TestEnd;
result: TestResult;
}
@@ -79,14 +85,16 @@ declare namespace Deno {
interface TestReporter {
start(event: TestEventStart): Promise<void>;
- result(event: TestEventResult): Promise<void>;
+ testStart(msg: TestEventTestStart): Promise<void>;
+ testEnd(msg: TestEventTestEnd): Promise<void>;
end(event: TestEventEnd): Promise<void>;
}
export class ConsoleTestReporter implements TestReporter {
constructor();
start(event: TestEventStart): Promise<void>;
- result(event: TestEventResult): Promise<void>;
+ testStart(msg: TestEventTestStart): Promise<void>;
+ testEnd(msg: TestEventTestEnd): Promise<void>;
end(event: TestEventEnd): Promise<void>;
}
diff --git a/cli/js/testing.ts b/cli/js/testing.ts
index a4523d2b7..ed34e08f7 100644
--- a/cli/js/testing.ts
+++ b/cli/js/testing.ts
@@ -1,12 +1,13 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { bgRed, gray, green, italic, red, yellow } from "./colors.ts";
+import { gray, green, italic, red, yellow } from "./colors.ts";
import { exit } from "./ops/os.ts";
-import { Console } from "./web/console.ts";
+import { Console, stringifyArgs } from "./web/console.ts";
+import { stdout } from "./files.ts";
+import { TextEncoder } from "./web/text_encoding.ts";
const RED_FAILED = red("FAILED");
-const GREEN_OK = green("OK");
+const GREEN_OK = green("ok");
const YELLOW_SKIPPED = yellow("SKIPPED");
-const RED_BG_FAIL = bgRed(" FAIL ");
const disabledConsole = new Console((_x: string, _isErr?: boolean): void => {});
function formatDuration(time = 0): string {
@@ -87,13 +88,14 @@ enum TestStatus {
interface TestResult {
name: string;
status: TestStatus;
- duration?: number;
+ duration: number;
error?: Error;
}
export enum TestEvent {
Start = "start",
- Result = "result",
+ TestStart = "testStart",
+ TestEnd = "testEnd",
End = "end"
}
@@ -102,8 +104,13 @@ interface TestEventStart {
tests: number;
}
-interface TestEventResult {
- kind: TestEvent.Result;
+interface TestEventTestStart {
+ kind: TestEvent.TestStart;
+ name: string;
+}
+
+interface TestEventTestEnd {
+ kind: TestEvent.TestEnd;
result: TestResult;
}
@@ -136,7 +143,7 @@ class TestApi {
}
async *[Symbol.asyncIterator](): AsyncIterator<
- TestEventStart | TestEventResult | TestEventEnd
+ TestEventStart | TestEventTestStart | TestEventTestEnd | TestEventEnd
> {
yield {
kind: TestEvent.Start,
@@ -146,7 +153,8 @@ class TestApi {
const results: TestResult[] = [];
const suiteStart = +new Date();
for (const { name, fn, skip } of this.testsToRun) {
- const result: Partial<TestResult> = { name };
+ const result: Partial<TestResult> = { name, duration: 0 };
+ yield { kind: TestEvent.TestStart, name };
if (skip) {
result.status = TestStatus.Skipped;
this.stats.ignored++;
@@ -154,17 +162,17 @@ class TestApi {
const start = +new Date();
try {
await fn();
- result.duration = +new Date() - start;
result.status = TestStatus.Passed;
this.stats.passed++;
} catch (err) {
- result.duration = +new Date() - start;
result.status = TestStatus.Failed;
result.error = err;
this.stats.failed++;
+ } finally {
+ result.duration = +new Date() - start;
}
}
- yield { kind: TestEvent.Result, result: result as TestResult };
+ yield { kind: TestEvent.TestEnd, result: result as TestResult };
results.push(result as TestResult);
if (this.failFast && result.error != null) {
break;
@@ -211,46 +219,78 @@ function createFilterFn(
interface TestReporter {
start(msg: TestEventStart): Promise<void>;
- result(msg: TestEventResult): Promise<void>;
+ testStart(msg: TestEventTestStart): Promise<void>;
+ testEnd(msg: TestEventTestEnd): Promise<void>;
end(msg: TestEventEnd): Promise<void>;
}
export class ConsoleTestReporter implements TestReporter {
- private console: Console;
+ private encoder: TextEncoder;
+
constructor() {
- this.console = globalThis.console as Console;
+ this.encoder = new TextEncoder();
+ }
+
+ private log(msg: string, noNewLine = false): void {
+ if (!noNewLine) {
+ msg += "\n";
+ }
+
+ // Using `stdout` here because it doesn't force new lines
+ // compared to `console.log`; `core.print` on the other hand
+ // is line-buffered and doesn't output message without newline
+ stdout.writeSync(this.encoder.encode(msg));
}
async start(event: TestEventStart): Promise<void> {
- this.console.log(`running ${event.tests} tests`);
+ this.log(`running ${event.tests} tests`);
}
- async result(event: TestEventResult): Promise<void> {
+ async testStart(event: TestEventTestStart): Promise<void> {
+ const { name } = event;
+
+ this.log(`test ${name} ... `, true);
+ }
+
+ async testEnd(event: TestEventTestEnd): Promise<void> {
const { result } = event;
switch (result.status) {
case TestStatus.Passed:
- this.console.log(
- `${GREEN_OK} ${result.name} ${formatDuration(result.duration!)}`
- );
+ this.log(`${GREEN_OK} ${formatDuration(result.duration)}`);
break;
case TestStatus.Failed:
- this.console.log(
- `${RED_FAILED} ${result.name} ${formatDuration(result.duration!)}`
- );
- this.console.log(result.error!);
+ this.log(`${RED_FAILED} ${formatDuration(result.duration)}`);
break;
case TestStatus.Skipped:
- this.console.log(`${YELLOW_SKIPPED} ${result.name}`);
+ this.log(`${YELLOW_SKIPPED} ${formatDuration(result.duration)}`);
break;
}
}
async end(event: TestEventEnd): Promise<void> {
- const { stats, duration } = event;
+ const { stats, duration, results } = event;
// Attempting to match the output of Rust's test runner.
- this.console.log(
- `\ntest result: ${stats.failed ? RED_BG_FAIL : GREEN_OK} ` +
+ const failedTests = results.filter(r => r.error);
+
+ if (failedTests.length > 0) {
+ this.log(`\nfailures:\n`);
+
+ for (const result of failedTests) {
+ this.log(`${result.name}`);
+ this.log(`${stringifyArgs([result.error!])}`);
+ this.log("");
+ }
+
+ this.log(`failures:\n`);
+
+ for (const result of failedTests) {
+ this.log(`\t${result.name}`);
+ }
+ }
+
+ this.log(
+ `\ntest result: ${stats.failed ? RED_FAILED : GREEN_OK}. ` +
`${stats.passed} passed; ${stats.failed} failed; ` +
`${stats.ignored} ignored; ${stats.measured} measured; ` +
`${stats.filtered} filtered out ` +
@@ -293,8 +333,11 @@ export async function runTests({
case TestEvent.Start:
await reporter.start(testMsg);
continue;
- case TestEvent.Result:
- await reporter.result(testMsg);
+ case TestEvent.TestStart:
+ await reporter.testStart(testMsg);
+ continue;
+ case TestEvent.TestEnd:
+ await reporter.testEnd(testMsg);
continue;
case TestEvent.End:
endMsg = testMsg;
diff --git a/cli/js/tests/README.md b/cli/js/tests/README.md
index 40c3410e1..7553582d2 100644
--- a/cli/js/tests/README.md
+++ b/cli/js/tests/README.md
@@ -47,48 +47,32 @@ Runner discoveres required permissions combinations by loading
There are three ways to run `unit_test_runner.ts`:
-- run tests matching current process permissions
-
```
-// run tests that don't require any permissions
-target/debug/deno unit_test_runner.ts
-
-// run tests with "net" permission
-target/debug/deno --allow-net unit_test_runner.ts
+# Run all tests. Spawns worker processes for each discovered permission
+# combination:
+target/debug/deno -A cli/js/tests/unit_test_runner.ts --master
-target/debug/deno --allow-net --allow-read unit_test_runner.ts
-```
+# By default all output of worker processes is discarded; for debug purposes
+# the --verbose flag preserves output from the worker
+target/debug/deno -A cli/js/tests/unit_test_runner.ts --master --verbose
-- run all tests - "master" mode, that spawns worker processes for each
- discovered permission combination:
+# Run subset of tests that don't require any permissions
+target/debug/deno cli/js/tests/unit_test_runner.ts
-```
-target/debug/deno -A unit_test_runner.ts --master
-```
+# Run subset tests that require "net" and "read" permissions
+target/debug/deno --allow-net --allow-read cli/js/tests/unit_test_runner.ts
-By default all output of worker processes is discarded; for debug purposes
-`--verbose` flag can be provided to preserve output from worker
+# "worker" mode communicates with parent using TCP socket on provided address;
+# after initial setup drops permissions to specified set. It shouldn't be used
+# directly, only be "master" process.
+target/debug/deno -A cli/js/tests/unit_test_runner.ts --worker --addr=127.0.0.1:4500 --perms=net,write,run
-```
-target/debug/deno -A unit_test_runner.ts --master --verbose
+# Run specific tests
+target/debug/deno --allow-net cli/js/tests/unit_test_runner.ts -- netTcpListenClose
```
-- "worker" mode; communicates with parent using TCP socket on provided address;
- after initial setup drops permissions to specified set. It shouldn't be used
- directly, only be "master" process.
-
-```
-target/debug/deno -A unit_test_runner.ts --worker --addr=127.0.0.1:4500 --perms=net,write,run
-```
-
-### Filtering
-
-Runner supports basic test filtering by name:
-
-```
-target/debug/deno unit_test_runner.ts -- netAccept
-
-target/debug/deno -A unit_test_runner.ts --master -- netAccept
-```
+### Http server
-Filter string must be specified after "--" argument
+`tools/http_server.py` is required to run when one's running unit tests. During
+CI it's spawned automatically, but if you want to run tests manually make sure
+that server is spawned otherwise there'll be cascade of test failures.
diff --git a/cli/js/tests/test_util.ts b/cli/js/tests/test_util.ts
index a904b9412..78147f28c 100644
--- a/cli/js/tests/test_util.ts
+++ b/cli/js/tests/test_util.ts
@@ -92,10 +92,6 @@ export async function registerUnitTests(): Promise<void> {
const processPerms = await getProcessPermissions();
for (const unitTestDefinition of REGISTERED_UNIT_TESTS) {
- if (unitTestDefinition.skip) {
- continue;
- }
-
if (!permissionsMatch(processPerms, unitTestDefinition.perms)) {
continue;
}
@@ -172,10 +168,8 @@ interface UnitTestOptions {
perms?: UnitTestPermissions;
}
-interface UnitTestDefinition {
- name: string;
- fn: Deno.TestFunction;
- skip?: boolean;
+interface UnitTestDefinition extends Deno.TestDefinition {
+ skip: boolean;
perms: Permissions;
}
@@ -210,10 +204,6 @@ export function unitTest(
assert(name, "Missing test function name");
}
- if (options.skip) {
- return;
- }
-
const normalizedPerms = normalizeTestPermissions(options.perms || {});
registerPermCombination(normalizedPerms);
@@ -262,7 +252,11 @@ export class SocketReporter implements Deno.TestReporter {
await this.write(msg);
}
- async result(msg: Deno.TestEventResult): Promise<void> {
+ async testStart(msg: Deno.TestEventTestStart): Promise<void> {
+ await this.write(msg);
+ }
+
+ async testEnd(msg: Deno.TestEventTestEnd): Promise<void> {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const serializedMsg: any = { ...msg };
diff --git a/cli/js/tests/unit_test_runner.ts b/cli/js/tests/unit_test_runner.ts
index 3fe66408b..fea6aa8da 100755
--- a/cli/js/tests/unit_test_runner.ts
+++ b/cli/js/tests/unit_test_runner.ts
@@ -17,6 +17,7 @@ interface PermissionSetTestResult {
stats: Deno.TestStats;
permsStr: string;
duration: number;
+ results: Deno.TestResult[];
}
const PERMISSIONS: Deno.PermissionName[] = [
@@ -144,16 +145,17 @@ async function runTestsForPermissionSet(
expectedPassedTests = msg.tests;
await reporter.start(msg);
continue;
- }
-
- if (msg.kind === Deno.TestEvent.Result) {
- await reporter.result(msg);
+ } else if (msg.kind === Deno.TestEvent.TestStart) {
+ await reporter.testStart(msg);
continue;
+ } else if (msg.kind === Deno.TestEvent.TestEnd) {
+ await reporter.testEnd(msg);
+ continue;
+ } else {
+ endEvent = msg;
+ await reporter.end(msg);
+ break;
}
-
- endEvent = msg;
- await reporter.end(msg);
- break;
}
} catch (e) {
hasThrown = true;
@@ -183,14 +185,16 @@ async function runTestsForPermissionSet(
workerProcess.close();
- const passed = expectedPassedTests === endEvent.stats.passed;
+ const passed =
+ expectedPassedTests === endEvent.stats.passed + endEvent.stats.ignored;
return {
perms,
passed,
permsStr: permsFmt,
duration: endEvent.duration,
- stats: endEvent.stats
+ stats: endEvent.stats,
+ results: endEvent.results
};
}
@@ -225,13 +229,13 @@ async function masterRunnerMain(
let testsPassed = true;
for (const testResult of testResults) {
- const { permsStr, stats, duration } = testResult;
+ const { permsStr, stats, duration, results } = testResult;
console.log(`Summary for ${permsStr}`);
await consoleReporter.end({
kind: Deno.TestEvent.End,
stats,
duration,
- results: []
+ results
});
testsPassed = testsPassed && testResult.passed;
}
diff --git a/cli/tests/057_revoke_permissions.out b/cli/tests/057_revoke_permissions.out
index 5ea2b9ecb..45c1340ee 100644
--- a/cli/tests/057_revoke_permissions.out
+++ b/cli/tests/057_revoke_permissions.out
@@ -1,10 +1,10 @@
running 7 tests
-OK runGranted [WILDCARD]
-OK readGranted [WILDCARD]
-OK writeGranted [WILDCARD]
-OK netGranted [WILDCARD]
-OK envGranted [WILDCARD]
-OK pluginGranted [WILDCARD]
-OK hrtimeGranted [WILDCARD]
+test runGranted ... ok [WILDCARD]
+test readGranted ... ok [WILDCARD]
+test writeGranted ... ok [WILDCARD]
+test netGranted ... ok [WILDCARD]
+test envGranted ... ok [WILDCARD]
+test pluginGranted ... ok [WILDCARD]
+test hrtimeGranted ... ok [WILDCARD]
-test result: OK 7 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
+test result: ok. 7 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
diff --git a/cli/tests/compiler_api_test.out b/cli/tests/compiler_api_test.out
index 9ab6536a2..b0071bd5a 100644
--- a/cli/tests/compiler_api_test.out
+++ b/cli/tests/compiler_api_test.out
@@ -1,15 +1,16 @@
running 12 tests
-OK compilerApiCompileSources [WILDCARD]
-OK compilerApiCompileNoSources [WILDCARD]
-OK compilerApiCompileOptions [WILDCARD]
-OK compilerApiCompileLib [WILDCARD]
-OK compilerApiCompileTypes [WILDCARD]
-OK transpileOnlyApi [WILDCARD]
-OK transpileOnlyApiConfig [WILDCARD]
-OK bundleApiSources [WILDCARD]
-OK bundleApiNoSources [WILDCARD]
-OK bundleApiConfig [WILDCARD]
-OK bundleApiJsModules [WILDCARD]
-OK diagnosticsTest [WILDCARD]
+test compilerApiCompileSources ... ok [WILDCARD]
+test compilerApiCompileNoSources ... ok [WILDCARD]
+test compilerApiCompileOptions ... ok [WILDCARD]
+test compilerApiCompileLib ... ok [WILDCARD]
+test compilerApiCompileTypes ... ok [WILDCARD]
+test transpileOnlyApi ... ok [WILDCARD]
+test transpileOnlyApiConfig ... ok [WILDCARD]
+test bundleApiSources ... ok [WILDCARD]
+test bundleApiNoSources ... ok [WILDCARD]
+test bundleApiConfig ... ok [WILDCARD]
+test bundleApiJsModules ... ok [WILDCARD]
+test diagnosticsTest ... ok [WILDCARD]
+
+test result: ok. 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
-test result: OK 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
diff --git a/cli/tests/workers_test.out b/cli/tests/workers_test.out
index 1238ca70a..efc0ce57c 100644
--- a/cli/tests/workers_test.out
+++ b/cli/tests/workers_test.out
@@ -1,7 +1,7 @@
running 4 tests
-OK workersBasic [WILDCARD]
-OK nestedWorker [WILDCARD]
-OK workerThrowsWhenExecuting [WILDCARD]
-OK workerCanUseFetch [WILDCARD]
+test workersBasic ... ok [WILDCARD]
+test nestedWorker ... ok [WILDCARD]
+test workerThrowsWhenExecuting ... ok [WILDCARD]
+test workerCanUseFetch ... ok [WILDCARD]
-test result: OK 4 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
+test result: ok. 4 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 16:34:41 +0000