From b847b1030f779d681c955f397a6e36bf6808cd41 Mon Sep 17 00:00:00 2001 From: sj0602 Date: Tue, 26 Mar 2024 10:54:14 -0700 Subject: [PATCH] Add ChromeiOS version support (#45326) * Add ChromeiOS version support * fix * fix * fix --- tools/wpt/browser.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/wpt/browser.py b/tools/wpt/browser.py index 2f9c4531315303..ea71499ec405ce 100644 --- a/tools/wpt/browser.py +++ b/tools/wpt/browser.py @@ -1559,7 +1559,23 @@ def install_webdriver(self, dest=None, channel=None, browser_binary=None): raise NotImplementedError def version(self, binary=None, webdriver_binary=None): - return None + if webdriver_binary is None: + self.logger.warning( + "Cannot find ChromeiOS version without CWTChromeDriver") + return None + # Use `chrome iOS driver --version` to get the version. Example output: + # "125.0.6378.0" + try: + version_string = call(webdriver_binary, "--version").strip() + except subprocess.CalledProcessError as e: + self.logger.warning(f"Failed to call {webdriver_binary}: {e}") + return None + m = re.match(r"[\d][\d\.]*", version_string) + if not m: + self.logger.warning( + f"Failed to extract version from: {version_string}") + return None + return m.group(0) class Opera(Browser):