diff --git a/ci/docker/conda-python-emscripten.dockerfile b/ci/docker/conda-python-emscripten.dockerfile index 878f918710f2..c56bf4f0c593 100644 --- a/ci/docker/conda-python-emscripten.dockerfile +++ b/ci/docker/conda-python-emscripten.dockerfile @@ -20,7 +20,7 @@ ARG arch ARG python="3.12" FROM ${repo}:${arch}-conda-python-${python} -ARG selenium_version="4.15.2" +ARG selenium_version="4.41.0" ARG pyodide_version="0.26.0" ARG chrome_version="latest" ARG required_python_min="(3,12)" diff --git a/compose.yaml b/compose.yaml index c799059fe254..a1ba7b0c3df1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -948,8 +948,8 @@ services: clang_tools: ${CLANG_TOOLS} llvm: ${LLVM} pyodide_version: "0.26.0" - chrome_version: "134" - selenium_version: "4.15.2" + chrome_version: "146" + selenium_version: "4.41.0" required_python_min: "(3,12)" python: ${PYTHON} shm_size: *shm-size diff --git a/python/scripts/run_emscripten_tests.py b/python/scripts/run_emscripten_tests.py index a4f9ce9d9a28..b8dcb7aeca1b 100644 --- a/python/scripts/run_emscripten_tests.py +++ b/python/scripts/run_emscripten_tests.py @@ -35,7 +35,9 @@ class TemplateOverrider(http.server.SimpleHTTPRequestHandler): def log_request(self, code="-", size="-"): - # don't log successful requests + # don't log successful requests but log errors + if isinstance(code, int) and code >= 400: + sys.stderr.write(f"HTTP {code} for {self.path}\n") return def do_GET(self) -> bytes | None: @@ -200,7 +202,7 @@ class BrowserDriver: def __init__(self, hostname, port, driver): self.driver = driver self.driver.get(f"http://{hostname}:{port}/test.html") - self.driver.set_script_timeout(100) + self.driver.set_script_timeout(300) def load_pyodide(self, dist_dir): pass @@ -259,7 +261,9 @@ def __init__(self, hostname, port): options = Options() options.add_argument("--headless") options.add_argument("--no-sandbox") - super().__init__(hostname, port, webdriver.Chrome(options=options)) + driver = webdriver.Chrome(options=options) + driver.command_executor._client_config.timeout = 300 + super().__init__(hostname, port, driver) class FirefoxDriver(BrowserDriver):