From da12af24c20f94124335a27213d01cd035242e73 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 31 Jan 2025 15:34:53 -0800 Subject: [PATCH] chore: harden trace file regex (#34563) --- packages/playwright/src/worker/testTracing.ts | 2 +- packages/trace-viewer/src/sw/traceModel.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/playwright/src/worker/testTracing.ts b/packages/playwright/src/worker/testTracing.ts index fde5ea5f3f..7b83fa48eb 100644 --- a/packages/playwright/src/worker/testTracing.ts +++ b/packages/playwright/src/worker/testTracing.ts @@ -335,7 +335,7 @@ async function mergeTraceFiles(fileName: string, temporaryTraceFiles: string[]) // Keep the name for test traces so that the last test trace // that contains most of the information is kept in the trace. // Note the reverse order of the iteration (from new traces to old). - } else if (entry.fileName.match(/[\d-]*trace\./)) { + } else if (entry.fileName.match(/trace\.[a-z]*$/)) { entryName = i + '-' + entry.fileName; } if (entryNames.has(entryName)) { diff --git a/packages/trace-viewer/src/sw/traceModel.ts b/packages/trace-viewer/src/sw/traceModel.ts index 602ff4e075..8230824f5d 100644 --- a/packages/trace-viewer/src/sw/traceModel.ts +++ b/packages/trace-viewer/src/sw/traceModel.ts @@ -43,7 +43,7 @@ export class TraceModel { const ordinals: string[] = []; let hasSource = false; for (const entryName of await this._backend.entryNames()) { - const match = entryName.match(/(.+)\.trace/); + const match = entryName.match(/(.+)\.trace$/); if (match) ordinals.push(match[1] || ''); if (entryName.includes('src@'))