rebase

Author: mxschmitt

packages/playwright-core/src/server/browserType.ts

@@ -264,17 +264,21 @@ export abstract class BrowserType extends SdkObject {
       close: () => closeOrKill((options as any).__testHookBrowserCloseTimeout || DEFAULT_PLAYWRIGHT_TIMEOUT),
       kill
     };
-    progress.cleanupWhenAborted(() => closeOrKill(DEFAULT_PLAYWRIGHT_TIMEOUT));
-    const { wsEndpoint } = await progress.race([
-      this.waitForReadyState(options, browserLogsCollector),
-      exitPromise.then(() => ({ wsEndpoint: undefined })),
-    ]);
-    if (options.cdpPort !== undefined || !this.supportsPipeTransport())
-      transport = await WebSocketTransport.connect(progress, wsEndpoint!);
-    else
-      transport = new PipeTransport(processLifecycleHooks.writePipe(launchedProcess), processLifecycleHooks.readPipe(launchedProcess));
-    progress.cleanupWhenAborted(() => transport.close());
-    return { browserProcess, artifactsDir: prepared.artifactsDir, userDataDir: prepared.userDataDir, transport };
+    try {
+      const { wsEndpoint } = await progress.race([
+        this.waitForReadyState(options, browserLogsCollector),
+        exitPromise.then(() => ({ wsEndpoint: undefined })),
+      ]);
+      if (options.cdpPort !== undefined || !this.supportsPipeTransport())
+        transport = await WebSocketTransport.connect(progress, wsEndpoint!);
+      else
+        transport = new PipeTransport(processLifecycleHooks.writePipe(launchedProcess), processLifecycleHooks.readPipe(launchedProcess));
+      return { browserProcess, artifactsDir: prepared.artifactsDir, userDataDir: prepared.userDataDir, transport };
+    } catch (error) {
+      transport?.close();
+      await closeOrKill(DEFAULT_PLAYWRIGHT_TIMEOUT).catch(() => {});
+      throw error;
+    }
   }
 
   async _createArtifactDirs(options: types.LaunchOptions): Promise<void> {

tests/installation/playwright-cli-install-should-work.spec.ts

@@ -63,7 +63,7 @@ test('install command should work', async ({ exec, checkInstalledSoftwareOnDisk
 
 test('install command should work with proxy', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36650' } }, async ({ exec, checkInstalledSoftwareOnDisk }) => {
   await exec('npm i playwright');
-  const proxy = await TestProxy.create(8947 + test.info().workerIndex * 4);
+  const proxy = await TestProxy.create(8947 + test.info().workerIndex * 4, 'localhost');
   proxy.forwardTo(443, { preserveHostname: true });
   await test.step('playwright install chromium', async () => {
     const result = await exec('npx playwright install chromium', {