From 9acbf90b06bf79dd6e4cf2428b3566da009bed65 Mon Sep 17 00:00:00 2001
From: Asher Gomez <ashersaupingomez@gmail.com>
Date: Wed, 17 Apr 2024 20:40:47 +1000
Subject: [PATCH] fix: allow WPT to successfully exit using `--exit-zero`
 (#23418)

I went with `--exit-zero`. Happy to change to `--no-exit` if feelings
are strong.

Supercedes #23417
---
 .github/workflows/wpt_epoch.yml | 2 +-
 tests/wpt/wpt.ts                | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/wpt_epoch.yml b/.github/workflows/wpt_epoch.yml
index 75a2886aad..3155ae42f2 100644
--- a/.github/workflows/wpt_epoch.yml
+++ b/.github/workflows/wpt_epoch.yml
@@ -72,7 +72,7 @@ jobs:
           deno run --unstable --allow-write --allow-read --allow-net           \
             --allow-env --allow-run --lock=tools/deno.lock.json                \
             ./tests/wpt/wpt.ts run                                                 \                                                \
-            --binary=$(which deno) --quiet --release --no-ignore --json=wpt.json --wptreport=wptreport.json
+            --binary=$(which deno) --quiet --release --no-ignore --json=wpt.json --wptreport=wptreport.json --exit-zero
 
       - name: Upload wpt results to wpt.fyi
         env:
diff --git a/tests/wpt/wpt.ts b/tests/wpt/wpt.ts
index 056db5dc06..675ef3ae08 100755
--- a/tests/wpt/wpt.ts
+++ b/tests/wpt/wpt.ts
@@ -550,6 +550,12 @@ function reportFinal(
     }. ${finalPassedCount} passed; ${finalFailedCount} failed; ${finalExpectedFailedAndFailedCount} expected failure; total ${finalTotalCount} (${duration}ms)\n`,
   );
 
+  // We ignore the exit code of the test run because the CI job reports the
+  // results to WPT.fyi, and we still want to report failure.
+  if (Deno.args.includes("--exit-zero")) {
+    return 0;
+  }
+
   return failed ? 1 : 0;
 }