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

changed naming to NON_ISOLATED_TESTS

Browse source
This commit is contained in:
Siarhei_Kliushnikau 2024-09-22 17:11:09 +02:00
parent a1d512f0c3
commit 3c39eb1dec
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/playwright/src/worker/workerMain.ts
View file

@ -266,7 +266,7 @@ export class WorkerMain extends ProcessRunner {
} }
}; };
if (!(this._isStopped && !process.env.NONE_ISOLATED)) if (!(this._isStopped && !process.env.NON_ISOLATED_TESTS))
this._fixtureRunner.setPool(test._pool!); this._fixtureRunner.setPool(test._pool!);
const suites = getSuites(test); const suites = getSuites(test);
@ -320,7 +320,7 @@ export class WorkerMain extends ProcessRunner {
await testInfo._tracing.startIfNeeded(traceFixtureRegistration.fn); await testInfo._tracing.startIfNeeded(traceFixtureRegistration.fn);
}); });
if ((this._isStopped && !process.env.NONE_ISOLATED) || isSkipped) { if ((this._isStopped && !process.env.NON_ISOLATED_TESTS) || isSkipped) {
// Two reasons to get here: // Two reasons to get here:
// - Last test is skipped, so we should not run the test, but run the cleanup. // - Last test is skipped, so we should not run the test, but run the cleanup.
// - Worker is requested to stop, but was not able to run full cleanup yet. // - Worker is requested to stop, but was not able to run full cleanup yet.
@ -396,7 +396,7 @@ export class WorkerMain extends ProcessRunner {
// In case of failure the worker will be stopped and we have to make sure that afterAll // In case of failure the worker will be stopped and we have to make sure that afterAll
// hooks run before worker fixtures teardown. // hooks run before worker fixtures teardown.
for (const suite of reversedSuites) { for (const suite of reversedSuites) {
if (!nextSuites.has(suite) || (testInfo._isFailure() && !process.env.NOT_ISOLATED)) { if (!nextSuites.has(suite) || (testInfo._isFailure() && !process.env.NON_ISOLATED_TESTS)) {
try { try {
await this._runAfterAllHooksForSuite(suite, testInfo); await this._runAfterAllHooksForSuite(suite, testInfo);
} catch (error) { } catch (error) {
@ -412,7 +412,7 @@ export class WorkerMain extends ProcessRunner {
if (testInfo._isFailure()) if (testInfo._isFailure())
this._isStopped = true; this._isStopped = true;
if (this._isStopped && !process.env.NONE_ISOLATED) { if (this._isStopped && !process.env.NON_ISOLATED_TESTS) {
// Run all remaining "afterAll" hooks and teardown all fixtures when worker is shutting down. // Run all remaining "afterAll" hooks and teardown all fixtures when worker is shutting down.
// Mark as "cleaned up" early to avoid running cleanup twice. // Mark as "cleaned up" early to avoid running cleanup twice.
this._didRunFullCleanup = true; this._didRunFullCleanup = true;
@ -535,7 +535,7 @@ export class WorkerMain extends ProcessRunner {
} }
} }
if (firstError) { if (firstError) {
if (process.env.NONE_ISOLATED) if (process.env.NON_ISOLATED_TESTS)
this._didRunFullCleanup = true; this._didRunFullCleanup = true;
throw firstError; throw firstError;
} }
@ -544,7 +544,7 @@ export class WorkerMain extends ProcessRunner {
private async _runAfterAllHooksForSuite(suite: Suite, testInfo: TestInfoImpl) { private async _runAfterAllHooksForSuite(suite: Suite, testInfo: TestInfoImpl) {
if (!this._activeSuites.has(suite)) if (!this._activeSuites.has(suite))
return; return;
if (!process.env.NONE_ISOLATED) if (!process.env.NON_ISOLATED_TESTS)
this._activeSuites.delete(suite); this._activeSuites.delete(suite);
await this._runAllHooksForSuite(suite, testInfo, 'afterAll'); await this._runAllHooksForSuite(suite, testInfo, 'afterAll');
} }