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

Restore results in onBegin

Browse source
This commit is contained in:
Yury Semikhatsky 2024-04-18 13:52:46 -07:00
parent 8c37ff0ec5
commit 9661e83fc8
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/playwright/src/isomorphic/teleReceiver.ts
View file

@ -521,6 +521,11 @@ export class TeleTestCase implements reporterTypes.TestCase {
this._resultsMap.clear(); this._resultsMap.clear();
} }
_restoreResults(snapshot: Map<string, TeleTestResult>) {
this.results = [...snapshot.values()];
this._resultsMap = snapshot;
}
_createTestResult(id: string): TeleTestResult { _createTestResult(id: string): TeleTestResult {
const result = new TeleTestResult(this.results.length); const result = new TeleTestResult(this.results.length);
this.results.push(result); this.results.push(result);

24
packages/trace-viewer/src/ui/teleSuiteUpdater.ts
View file

@ -42,6 +42,7 @@ export class TeleSuiteUpdater {
private _lastRunReceiver: TeleReporterReceiver | undefined; private _lastRunReceiver: TeleReporterReceiver | undefined;
private _lastRunTestCount = 0; private _lastRunTestCount = 0;
private _options: TeleSuiteUpdaterOptions; private _options: TeleSuiteUpdaterOptions;
private _testResultsSnapshot: TestResultsSnapshot | undefined;
constructor(options: TeleSuiteUpdaterOptions) { constructor(options: TeleSuiteUpdaterOptions) {
this._receiver = new TeleReporterReceiver(this._createReporter(), { this._receiver = new TeleReporterReceiver(this._createReporter(), {
@ -78,15 +79,18 @@ export class TeleSuiteUpdater {
onBegin: (suite: reporterTypes.Suite) => { onBegin: (suite: reporterTypes.Suite) => {
if (!this.rootSuite) if (!this.rootSuite)
this.rootSuite = suite as TeleSuite; this.rootSuite = suite as TeleSuite;
// As soon as new test tree is built add previous results.
this._testResultsSnapshot?.restore(this.rootSuite);
this._testResultsSnapshot = undefined;
this.progress.total = this._lastRunTestCount; this.progress.total = this._lastRunTestCount;
this.progress.passed = 0; this.progress.passed = 0;
this.progress.failed = 0; this.progress.failed = 0;
this.progress.skipped = 0; this.progress.skipped = 0;
// Do not call this._options.onUpdate(); here, as we want to wait this._options.onUpdate(true);
// for the test results to be restored in list mode.
}, },
onEnd: () => { onEnd: () => {
this._options.onUpdate(true);
}, },
onTestBegin: (test: reporterTypes.TestCase, testResult: reporterTypes.TestResult) => { onTestBegin: (test: reporterTypes.TestCase, testResult: reporterTypes.TestResult) => {
@ -124,14 +128,12 @@ export class TeleSuiteUpdater {
} }
processListReport(report: any[]) { processListReport(report: any[]) {
// Save test results and reset all projects. // Save test results and reset all projects, the results will be restored after
const results = this.rootSuite && TestResultsSnapshot.saveResults(this.rootSuite); // new project structure is built.
this._testResultsSnapshot = this.rootSuite && TestResultsSnapshot.saveResults(this.rootSuite);
this._receiver.reset(); this._receiver.reset();
for (const message of report) for (const message of report)
this._receiver.dispatch(message); this._receiver.dispatch(message);
// After recreating all projects restore previous results.
results?.restore(this.rootSuite!);
this._options.onUpdate(true);
} }
processTestReportEvent(message: any) { processTestReportEvent(message: any) {
@ -152,7 +154,7 @@ export class TeleSuiteUpdater {
} }
class TestResultsSnapshot { class TestResultsSnapshot {
private _testIdToResults = new Map<string, TeleTestResult[]>(); private _testIdToResults = new Map<string, Map<string, TeleTestResult>>();
static saveResults(rootSuite: TeleSuite) { static saveResults(rootSuite: TeleSuite) {
const snapshot = new TestResultsSnapshot(); const snapshot = new TestResultsSnapshot();
@ -163,8 +165,8 @@ class TestResultsSnapshot {
private _saveForSuite(suite: TeleSuite) { private _saveForSuite(suite: TeleSuite) {
for (const entry of suite.entries()) { for (const entry of suite.entries()) {
if (entry.type === 'test') { if (entry.type === 'test') {
if (entry.results.length) if (entry._resultsMap.size)
this._testIdToResults.set(entry.id, entry.results); this._testIdToResults.set(entry.id, entry._resultsMap);
} else { } else {
this._saveForSuite(entry); this._saveForSuite(entry);
} }
@ -176,7 +178,7 @@ class TestResultsSnapshot {
if (entry.type === 'test') { if (entry.type === 'test') {
const results = this._testIdToResults.get(entry.id); const results = this._testIdToResults.get(entry.id);
if (results) if (results)
entry.results = results; entry._restoreResults(results);
} else { } else {
this.restore(entry); this.restore(entry);
} }