mirror of
https://github.com/denoland/deno.git
synced 2024-11-27 16:10:57 -05:00
Fix parallel testing (denoland/deno_std#309)
Fixes denoland/deno_std#308
Co-authored by @chiefbiiko
Original: cac060f388
This commit is contained in:
parent
b7022848f6
commit
8f0407efad
2 changed files with 22 additions and 7 deletions
|
@ -1,3 +1,11 @@
|
|||
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
import { runTests } from "./mod.ts";
|
||||
runTests();
|
||||
|
||||
async function main() {
|
||||
// Testing entire test suite serially
|
||||
await runTests();
|
||||
// Testing parallel execution on a subset that does not depend on exec order
|
||||
await runTests({ parallel: true, only: /^testing/ });
|
||||
}
|
||||
|
||||
main();
|
||||
|
|
|
@ -10,7 +10,7 @@ export interface TestDefinition {
|
|||
}
|
||||
|
||||
let filterRegExp: RegExp | null;
|
||||
const tests: TestDefinition[] = [];
|
||||
const candidates: TestDefinition[] = [];
|
||||
|
||||
let filtered = 0;
|
||||
|
||||
|
@ -35,7 +35,7 @@ export function test(t: TestDefinition | TestFunction): void {
|
|||
throw new Error("Test function may not be anonymous");
|
||||
}
|
||||
if (filter(name)) {
|
||||
tests.push({ fn, name });
|
||||
candidates.push({ fn, name });
|
||||
} else {
|
||||
filtered++;
|
||||
}
|
||||
|
@ -124,8 +124,8 @@ function previousPrinted(name: string, results: TestResults): boolean {
|
|||
async function createTestCase(
|
||||
stats: TestStats,
|
||||
results: TestResults,
|
||||
{ fn, name }: TestDefinition,
|
||||
exitOnFail: boolean
|
||||
exitOnFail: boolean,
|
||||
{ fn, name }: TestDefinition
|
||||
): Promise<void> {
|
||||
const result: TestResult = results.cases.get(results.keys.get(name));
|
||||
try {
|
||||
|
@ -197,6 +197,8 @@ async function runTestsSerial(
|
|||
export interface RunOptions {
|
||||
parallel?: boolean;
|
||||
exitOnFail?: boolean;
|
||||
only?: RegExp;
|
||||
skip?: RegExp;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -205,11 +207,16 @@ export interface RunOptions {
|
|||
*/
|
||||
export async function runTests({
|
||||
parallel = false,
|
||||
exitOnFail = false
|
||||
exitOnFail = false,
|
||||
only = /[^\s]/,
|
||||
skip = /^\s*$/
|
||||
}: RunOptions = {}): Promise<void> {
|
||||
const tests: TestDefinition[] = candidates.filter(
|
||||
({ name }) => only.test(name) && !skip.test(name)
|
||||
);
|
||||
const stats: TestStats = {
|
||||
measured: 0,
|
||||
ignored: 0,
|
||||
ignored: candidates.length - tests.length,
|
||||
filtered: filtered,
|
||||
passed: 0,
|
||||
failed: 0
|
||||
|
|
Loading…
Reference in a new issue