From 3673776330d23148aee7f41dbbfb63da08e281f8 Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Mon, 1 Nov 2021 19:27:41 -0800
Subject: [PATCH] Revert "chore(test-runner): use test name as trace file name
 prefix (#9619)" (#9956)

This reverts commit 3c420a7cf1353969c805f647cc58416dcb85e030.
---
 packages/playwright-test/src/index.ts         |  3 +-
 .../playwright.artifacts.spec.ts              | 50 +++++++++----------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/packages/playwright-test/src/index.ts b/packages/playwright-test/src/index.ts
index 81a9e784b5..0bbc5be97b 100644
--- a/packages/playwright-test/src/index.ts
+++ b/packages/playwright-test/src/index.ts
@@ -22,7 +22,6 @@ import { rootTestType } from './testType';
 import { createGuid, removeFolders } from 'playwright-core/lib/utils/utils';
 import { GridClient } from 'playwright-core/lib/grid/gridClient';
 import { Browser } from 'playwright-core';
-import { sanitizeForFilePath } from './util';
 export { expect } from './expect';
 export const _baseTest: TestType<{}, {}> = rootTestType.test;
 
@@ -255,7 +254,7 @@ export const test = _baseTest.extend<TestFixtures, WorkerAndFileFixtures>({
 
     const traceAttachments: string[] = [];
     const addTraceAttachment = () => {
-      const tracePath = testInfo.outputPath(`trace-${sanitizeForFilePath(testInfo.title)}${traceAttachments.length ? '-' + traceAttachments.length : ''}.zip`);
+      const tracePath = testInfo.outputPath(`trace${traceAttachments.length ? '-' + traceAttachments.length : ''}.zip`);
       traceAttachments.push(tracePath);
       testInfo.attachments.push({ name: 'trace', path: tracePath, contentType: 'application/zip' });
       return tracePath;
diff --git a/tests/playwright-test/playwright.artifacts.spec.ts b/tests/playwright-test/playwright.artifacts.spec.ts
index d2f80dc90e..ccf39751ff 100644
--- a/tests/playwright-test/playwright.artifacts.spec.ts
+++ b/tests/playwright-test/playwright.artifacts.spec.ts
@@ -199,27 +199,27 @@ test('should work with trace: on', async ({ runInlineTest }, testInfo) => {
   expect(result.failed).toBe(5);
   expect(listFiles(testInfo.outputPath('test-results'))).toEqual([
     'artifacts-failing',
-    '  trace-failing.zip',
+    '  trace.zip',
     'artifacts-own-context-failing',
-    '  trace-own-context-failing.zip',
+    '  trace.zip',
     'artifacts-own-context-passing',
-    '  trace-own-context-passing.zip',
+    '  trace.zip',
     'artifacts-passing',
-    '  trace-passing.zip',
+    '  trace.zip',
     'artifacts-persistent-failing',
-    '  trace-persistent-failing.zip',
+    '  trace.zip',
     'artifacts-persistent-passing',
-    '  trace-persistent-passing.zip',
+    '  trace.zip',
     'artifacts-shared-shared-failing',
-    '  trace-shared-failing.zip',
+    '  trace.zip',
     'artifacts-shared-shared-passing',
-    '  trace-shared-passing.zip',
+    '  trace.zip',
     'artifacts-two-contexts',
-    '  trace-two-contexts-1.zip',
-    '  trace-two-contexts.zip',
+    '  trace-1.zip',
+    '  trace.zip',
     'artifacts-two-contexts-failing',
-    '  trace-two-contexts-failing-1.zip',
-    '  trace-two-contexts-failing.zip',
+    '  trace-1.zip',
+    '  trace.zip',
     'report.json',
   ]);
 });
@@ -237,16 +237,16 @@ test('should work with trace: retain-on-failure', async ({ runInlineTest }, test
   expect(result.failed).toBe(5);
   expect(listFiles(testInfo.outputPath('test-results'))).toEqual([
     'artifacts-failing',
-    '  trace-failing.zip',
+    '  trace.zip',
     'artifacts-own-context-failing',
-    '  trace-own-context-failing.zip',
+    '  trace.zip',
     'artifacts-persistent-failing',
-    '  trace-persistent-failing.zip',
+    '  trace.zip',
     'artifacts-shared-shared-failing',
-    '  trace-shared-failing.zip',
+    '  trace.zip',
     'artifacts-two-contexts-failing',
-    '  trace-two-contexts-failing-1.zip',
-    '  trace-two-contexts-failing.zip',
+    '  trace-1.zip',
+    '  trace.zip',
     'report.json',
   ]);
 });
@@ -264,16 +264,16 @@ test('should work with trace: on-first-retry', async ({ runInlineTest }, testInf
   expect(result.failed).toBe(5);
   expect(listFiles(testInfo.outputPath('test-results'))).toEqual([
     'artifacts-failing-retry1',
-    '  trace-failing.zip',
+    '  trace.zip',
     'artifacts-own-context-failing-retry1',
-    '  trace-own-context-failing.zip',
+    '  trace.zip',
     'artifacts-persistent-failing-retry1',
-    '  trace-persistent-failing.zip',
+    '  trace.zip',
     'artifacts-shared-shared-failing-retry1',
-    '  trace-shared-failing.zip',
+    '  trace.zip',
     'artifacts-two-contexts-failing-retry1',
-    '  trace-two-contexts-failing-1.zip',
-    '  trace-two-contexts-failing.zip',
+    '  trace-1.zip',
+    '  trace.zip',
     'report.json',
   ]);
 });
@@ -313,7 +313,7 @@ test('should stop tracing with trace: on-first-retry, when not retrying', async
   expect(result.flaky).toBe(1);
   expect(listFiles(testInfo.outputPath('test-results'))).toEqual([
     'a-shared-flaky-retry1',
-    '  trace-flaky.zip',
+    '  trace.zip',
     'report.json',
   ]);
 });