From d841c675ccceae9e0d044d98ab0753917539f2ce Mon Sep 17 00:00:00 2001
From: Simon Knott <info@simonknott.de>
Date: Fri, 18 Oct 2024 11:00:36 +0200
Subject: [PATCH] Revert "make behaviour congruent for globalTeardown"

This reverts commit 9b785662f6e04f13f183985cf1f3b341e3480db3.
---
 packages/playwright/src/runner/tasks.ts    | 7 +------
 tests/playwright-test/global-setup.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/playwright/src/runner/tasks.ts b/packages/playwright/src/runner/tasks.ts
index aeaceadc8b..528cac47cd 100644
--- a/packages/playwright/src/runner/tasks.ts
+++ b/packages/playwright/src/runner/tasks.ts
@@ -182,15 +182,10 @@ function createGlobalSetupTask(index: number, length: number): Task<TestRun> {
       globalSetupFinished = true;
     },
     teardown: async ({ config }) => {
-      let firstError: any;
       if (typeof globalSetupResult === 'function')
-        try { await globalSetupResult(); } catch (error) { firstError = error; }
-
+        await globalSetupResult();
       if (globalSetupFinished)
         await teardownHook?.(config.config);
-
-      if (firstError)
-        throw firstError;
     },
   };
 }
diff --git a/tests/playwright-test/global-setup.spec.ts b/tests/playwright-test/global-setup.spec.ts
index 177d29a91d..f1bd7b7458 100644
--- a/tests/playwright-test/global-setup.spec.ts
+++ b/tests/playwright-test/global-setup.spec.ts
@@ -422,7 +422,7 @@ test('globalSetup should support multiple', async ({ runInlineTest }) => {
     'globalSetup3Function',
     'globalTeardown2',
     'globalSetup1Function',
-    'globalTeardown1',
+    // 'globalTeardown1' is missing, because globalSetup1Function errored out.
   ]);
   expect(result.output).toContain('Error: kaboom');
 });