Fix emscripten CI for Chrome 137+ (#3599)

joemarshall · pquentin · illia-v · web-flow · commit 9996e0fbf90b · 2025-06-05T17:02:10.000+04:00
Co-authored-by: Quentin Pradet &lt;quentin.pradet@gmail.com&gt;
Co-authored-by: Illia Volochii &lt;illia.volochii@gmail.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -116,8 +116,6 @@ jobs:
         if: ${{ matrix.nox-session == 'emscripten(chrome)' }}
         with:
           install-chromedriver: true
-          # Use stable until https://github.com/urllib3/urllib3/issues/3598 is fixed.
-          chrome-version: stable
       - name: Force override system chrome
         run: |
           sudo rm -f /usr/bin/google-chrome
diff --git a/test/contrib/emscripten/conftest.py b/test/contrib/emscripten/conftest.py
@@ -84,6 +84,19 @@ def _install_packages(self: Any) -> None:
         result = self.run_js(
             f'await pyodide.loadPackage("http://{testserver_http.http_host}:{testserver_http.http_port}/dist/urllib3.whl")'
         )
+        if not self.with_jspi:
+            # force Chrome to execute the current test without JSPI
+            # even though it is always enabled in
+            # chrome >= 137. We do this by monkeypatching
+            # pyodide.ffi.can_run_sync
+            self.run_async(
+                """
+                import pyodide.ffi
+                if pyodide.ffi.can_run_sync():
+                    pyodide.ffi.can_run_sync = lambda: False
+                """
+            )
+
         print("Installed package:", result)
         self.run_js(
             """
@@ -128,11 +141,14 @@ def _install_packages(self: Any) -> None:
 
 
 class ServerRunnerInfo:
-    def __init__(self, host: str, port: int, selenium: Any, dist_dir: Path) -> None:
+    def __init__(
+        self, host: str, port: int, selenium: Any, dist_dir: Path, has_jspi: bool
+    ) -> None:
         self.host = host
         self.port = port
         self.selenium = selenium
         self.dist_dir = dist_dir
+        self.has_jspi = has_jspi
 
     def run_webworker(self, code: str) -> Any:
         if isinstance(code, str) and code.startswith("\n"):
@@ -148,6 +164,19 @@ def run_webworker(self, code: str) -> Any:
             """
         )
 
+        # Monkeypatch pyodide to force disable JSPI in newer chrome
+        # so those code paths get tested
+        if self.has_jspi is False:
+            jspi_fix_code = textwrap.dedent(
+                """
+                import pyodide.ffi
+                if pyodide.ffi.can_run_sync():
+                    pyodide.ffi.can_run_sync = lambda: False
+                """
+            )
+        else:
+            jspi_fix_code = ""
+
         coverage_end_code = textwrap.dedent(
             """
             _coverage.stop()
@@ -164,7 +193,15 @@ def run_webworker(self, code: str) -> Any:
 
         # the ordering of these code blocks is important - makes sure
         # that the first thing that happens is our wheel is loaded
-        code = coverage_init_code + "\n" + code + "\n" + coverage_end_code
+        code = (
+            coverage_init_code
+            + "\n"
+            + jspi_fix_code
+            + "\n"
+            + code
+            + "\n"
+            + coverage_end_code
+        )
 
         if self.selenium.browser == "firefox":
             # running in worker is SLOW on firefox
@@ -232,6 +269,7 @@ def run_from_server(
         testserver_http.https_port,
         selenium_coverage,
         dist_dir,
+        selenium_coverage.with_jspi,
     )
 
 
