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

always use lastrun reporter and keep em internal

Browse source
This commit is contained in:
Mathias Leppich 2024-09-09 15:31:27 +02:00
parent e7273de4dd
commit 1eb11ffc0b
4 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright/src/common/config.ts
View file

@ -273,7 +273,7 @@ export function toReporters(reporters: BuiltInReporter | ReporterDescription[] |
return reporters;
}
export const builtInReporters = ['list', 'line', 'dot', 'json', 'junit', 'null', 'github', 'html', 'blob', 'markdown', 'lastrun'] as const;
export const builtInReporters = ['list', 'line', 'dot', 'json', 'junit', 'null', 'github', 'html', 'blob', 'markdown'] as const;
export type BuiltInReporter = typeof builtInReporters[number];
export type ContextReuseMode = 'none' | 'when-possible';

7
packages/playwright/src/runner/reporters.ts
View file

@ -47,7 +47,6 @@ export async function createReporters(config: FullConfigInternal, mode: 'list' |
null: EmptyReporter,
html: HtmlReporter,
markdown: MarkdownReporter,
lastrun: LastRunReporter,
};
const reporters: ReporterV2[] = [];
descriptions ??= config.config.reporter;
@ -78,6 +77,12 @@ export async function createReporters(config: FullConfigInternal, mode: 'list' |
else if (mode !== 'merge')
reporters.unshift(!process.env.CI ? new LineReporter({ omitFailures: true }) : new DotReporter());
}
if (!isTestServer && (mode === 'test' || mode === 'merge')) {
// If we are not in the test server, always add a last-run reporter.
reporters.push(new LastRunReporter(runOptions));
}
return reporters;
}

21
packages/playwright/src/runner/runner.ts
View file

@ -94,9 +94,6 @@ export class Runner {
if (modifiedResult && modifiedResult.status)
status = modifiedResult.status;
if (!listOnly)
await writeLastRunInfo(testRun, status);
await reporter.onExit();
// Calling process.exit() might truncate large stdout/stderr output.
@ -150,24 +147,6 @@ export type LastRunInfo = {
testDurations?: { [testId: string]: number };
};
async function writeLastRunInfo(testRun: TestRun, status: FullResult['status']) {
const [project] = filterProjects(testRun.config.projects, testRun.config.cliProjectFilter);
if (!project)
return;
const outputDir = project.project.outputDir;
const lastRunReportFile = testRun.config.lastRunFile || path.join(outputDir, '.last-run.json');
const lastRunReportFileDir = path.dirname(lastRunReportFile);
await fs.promises.mkdir(lastRunReportFileDir, { recursive: true });
const failedTests = testRun.rootSuite?.allTests().filter(t => !t.ok()).map(t => t.id);
const testDurations = testRun.rootSuite?.allTests().reduce((map, t) => {
if (t.results.length)
map[t.id] = t.results.reduce((a, b) => a + b.duration, 0);
return map;
}, {} as { [testId: string]: number });
const lastRunReport = JSON.stringify({ status, failedTests, testDurations }, undefined, 2);
await fs.promises.writeFile(lastRunReportFile, lastRunReport);
}
export async function readLastRunInfo(config: FullConfigInternal): Promise<LastRunInfo> {
const [project] = filterProjects(config.projects, config.cliProjectFilter);
if (!project)

17
tests/playwright-test/reporter-lastrun.spec.ts
View file

@ -37,7 +37,7 @@ const testCases = {
};
test('report lastrun info', async ({ runInlineTest }) => {
const result = await runInlineTest(testCases, { reporter: 'lastrun' });
const result = await runInlineTest(testCases, { });
expect(result.exitCode).toBe(1);
const lastRunFilename = test.info().outputPath('.last-run.json');
const lastRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -49,7 +49,7 @@ test('report lastrun info', async ({ runInlineTest }) => {
test('keep test-ids consistent when re-run', async ({ runInlineTest }) => {
let lastRun: LastRunReport;
{
const result = await runInlineTest(testCases, { reporter: 'lastrun' });
const result = await runInlineTest(testCases, { });
expect(result.exitCode).toBe(1);
const lastRunFilename = test.info().outputPath('.last-run.json');
const currentRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -58,7 +58,7 @@ test('keep test-ids consistent when re-run', async ({ runInlineTest }) => {
lastRun = currentRun;
}
{
const result = await runInlineTest(testCases, { reporter: 'lastrun' });
const result = await runInlineTest(testCases, { });
expect(result.exitCode).toBe(1);
const lastRunFilename = test.info().outputPath('.last-run.json');
const currentRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -76,7 +76,6 @@ test('keep test-ids consistent when merging reports', async ({ runInlineTest, me
...testCases,
'playwright.config.ts': `module.exports = {
reporter: [
['lastrun'],
['blob', { outputDir: 'blob-report' }],
]
};`,
@ -103,7 +102,7 @@ test('keep test-ids consistent when merging reports', async ({ runInlineTest, me
const reportFiles = await fs.promises.readdir(reportDir);
reportFiles.sort();
expect(reportFiles).toEqual(['report-1.zip', 'report-2.zip']);
const result = await mergeReports(reportDir, { 'PLAYWRIGHT_HTML_OPEN': 'never' }, { additionalArgs: ['--reporter', 'lastrun'] });
const result = await mergeReports(reportDir, { 'PLAYWRIGHT_HTML_OPEN': 'never' });
expect(result.exitCode).toBe(0);
const lastRunFilename = test.info().outputPath('.last-run.json');
const lastRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -124,7 +123,7 @@ test('keep existing test-ids when test files are modified', async ({ runInlineTe
expect(1 + 1).toBe(2);
});
`
}, { reporter: 'lastrun' });
}, { });
expect(result.exitCode).toBe(0);
const lastRunFilename = test.info().outputPath('.last-run.json');
const lastRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -147,7 +146,7 @@ test('keep existing test-ids when test files are modified', async ({ runInlineTe
expect(1 + 1).toBe(2);
});
`
}, { reporter: 'lastrun' });
}, { });
expect(result.exitCode).toBe(0);
const lastRunFilename = test.info().outputPath('.last-run.json');
const lastRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -167,7 +166,7 @@ test('ensure same tests in different files have distinct test-ids', async ({ run
expect(1 + 1).toBe(2);
});
`
}, { reporter: 'lastrun' }, {}, { additionalArgs: ['a.test.js'] });
}, { }, {}, { additionalArgs: ['a.test.js'] });
expect(result.exitCode).toBe(0);
const lastRunFilename = test.info().outputPath('.last-run.json');
const lastRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;
@ -183,7 +182,7 @@ test('ensure same tests in different files have distinct test-ids', async ({ run
expect(1 + 1).toBe(2);
});
`
}, { reporter: 'lastrun' }, {}, { additionalArgs: ['b.test.js'] });
}, { }, {}, { additionalArgs: ['b.test.js'] });
expect(result.exitCode).toBe(0);
const lastRunFilename = test.info().outputPath('.last-run.json');
const lastRun = JSON.parse(await fs.promises.readFile(lastRunFilename, 'utf8')) as LastRunReport;