Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

added parallelDescribes

Browse source
This commit is contained in:
Siarhei_Kliushnikau 2024-09-30 16:43:45 +02:00
parent 3c39eb1dec
commit f65196ff0f
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright/src/runner/dispatcher.ts
View file

@ -401,7 +401,7 @@ class JobDispatcher {
// - there are no remaining // - there are no remaining
// - we are here not because something failed // - we are here not because something failed
// - no unrecoverable worker error // - no unrecoverable worker error
if (!this._remainingByTestId.size && !this._failedTests.size && !params.fatalErrors.length && !params.skipTestsDueToSetupFailure.length && !params.fatalUnknownTestIds && !params.unexpectedExitError) { if (!this._remainingByTestId.size && !this._failedTests.size && !params.fatalErrors.length && !params.skipTestsDueToSetupFailure.length && !params.fatalUnknownTestIds && !params.unexpectedExitError && !process.env.NON_ISOLATED_TESTS) {
this._finished({ didFail: false }); this._finished({ didFail: false });
return; return;
} }

30
packages/playwright/src/runner/testGroups.ts
View file

@ -49,6 +49,7 @@ export function createTestGroups(projectSuite: Suite, workers: number): TestGrou
// These should run as a serial group, each group is independent, key === serial suite. // These should run as a serial group, each group is independent, key === serial suite.
parallel: Map<Suite | TestCase, TestGroup>, parallel: Map<Suite | TestCase, TestGroup>,
parallelWithHooks: TestGroup, parallelWithHooks: TestGroup,
parallelDescribes: Map<string, Array<TestCase>>,
}>>(); }>>();
const createGroup = (test: TestCase): TestGroup => { const createGroup = (test: TestCase): TestGroup => {
@ -73,6 +74,7 @@ export function createTestGroups(projectSuite: Suite, workers: number): TestGrou
general: createGroup(test), general: createGroup(test),
parallel: new Map(), parallel: new Map(),
parallelWithHooks: createGroup(test), parallelWithHooks: createGroup(test),
parallelDescribes: new Map(),
}; };
withWorkerHash.set(test._requireFile, withRequireFile); withWorkerHash.set(test._requireFile, withRequireFile);
} }
@ -81,16 +83,28 @@ export function createTestGroups(projectSuite: Suite, workers: number): TestGrou
let insideParallel = false; let insideParallel = false;
let outerMostSequentialSuite: Suite | undefined; let outerMostSequentialSuite: Suite | undefined;
let hasAllHooks = false; let hasAllHooks = false;
let hasDescribe = false;
let currentTitle = '';
for (let parent: Suite | undefined = test.parent; parent; parent = parent.parent) { for (let parent: Suite | undefined = test.parent; parent; parent = parent.parent) {
if (parent._parallelMode === 'serial' || parent._parallelMode === 'default') if (parent._parallelMode === 'serial' || parent._parallelMode === 'default')
outerMostSequentialSuite = parent; outerMostSequentialSuite = parent;
insideParallel = insideParallel || parent._parallelMode === 'parallel'; insideParallel = insideParallel || parent._parallelMode === 'parallel';
hasAllHooks = hasAllHooks || parent._hooks.some(hook => hook.type === 'beforeAll' || hook.type === 'afterAll'); hasAllHooks = hasAllHooks || parent._hooks.some(hook => hook.type === 'beforeAll' || hook.type === 'afterAll');
hasDescribe = hasDescribe || parent.type === 'describe';
if (parent._type === 'describe')
currentTitle = parent.title;
} }
if (insideParallel) { if (insideParallel) {
if (hasAllHooks && !outerMostSequentialSuite) { if ((hasAllHooks && !outerMostSequentialSuite && !process.env.NON_ISOLATED_TESTS) || (!hasDescribe && process.env.NON_ISOLATED_TESTS)) {
withRequireFile.parallelWithHooks.tests.push(test); withRequireFile.parallelWithHooks.tests.push(test);
} else if (hasDescribe && process.env.NON_ISOLATED_TESTS) {
if (!withRequireFile.parallelDescribes.get(currentTitle)) {
withRequireFile.parallelDescribes.set(currentTitle, [test]);
} else {
const value = withRequireFile.parallelDescribes.get(currentTitle);
value?.push(test);
}
} else { } else {
const key = outerMostSequentialSuite || test; const key = outerMostSequentialSuite || test;
let group = withRequireFile.parallel.get(key); let group = withRequireFile.parallel.get(key);
@ -125,6 +139,20 @@ export function createTestGroups(projectSuite: Suite, workers: number): TestGrou
} }
lastGroup.tests.push(test); lastGroup.tests.push(test);
} }
if (process.env.NON_ISOLATED_TESTS) {
const describeGroups = Array.from(withRequireFile.parallelDescribes, ([name, value]) => ({ name, value }));
let lastDescribeGroup;
for (const testGroup of describeGroups) {
lastDescribeGroup = null;
for (const test of testGroup.value) {
if (!lastDescribeGroup) {
lastDescribeGroup = createGroup(test);
result.push(lastDescribeGroup);
}
lastDescribeGroup.tests.push(test);
}
}
}
} }
} }
return result; return result;