commit fab131c2a67c3a5f05708baa8a0603e94c9963ef
author Brandon Walderman <brwalder@microsoft.com> Thu Oct 13 11:57:06 2022
committer GitHub <noreply@github.com> Thu Oct 13 11:57:06 2022
tree e93f1bfea9cf845d261f5c852efbab4194beb50f
parent f45efc8d0bdb22d91a81a2221081c5b80f2b1510

Update version detection for Edge binaries (#36382)

* Update version detection for Edge binaries
* Fix test_edgechromium_webdriver_version

Co-authored-by: Brandon Walderman <brwalder@microsoft.com>

tools/wpt/browser.py

diff --git a/tools/wpt/browser.py b/tools/wpt/browser.py
index 37de6bb..66796a8 100644
--- a/tools/wpt/browser.py
+++ b/tools/wpt/browser.py
@@ -1431,7 +1431,7 @@
         except (subprocess.CalledProcessError, OSError) as e:
             self.logger.warning(f"Failed to call {binary}: {e}")
             return None
-        m = re.match(r"Microsoft Edge (.*) ", version_string)
+        m = re.match(r"Microsoft Edge ([0-9][0-9.]*)", version_string)
         if not m:
             self.logger.warning(f"Failed to extract version from: {version_string}")
             return None
@@ -1449,7 +1449,7 @@
         except (subprocess.CalledProcessError, OSError) as e:
             self.logger.warning(f"Failed to call {webdriver_binary}: {e}")
             return None
-        m = re.match(r"MSEdgeDriver ([0-9][0-9.]*)", version_string)
+        m = re.match(r"Microsoft Edge WebDriver ([0-9][0-9.]*)", version_string)
         if not m:
             self.logger.warning(f"Failed to extract version from: {version_string}")
             return None

tools/wpt/tests/test_browser.py

diff --git a/tools/wpt/tests/test_browser.py b/tools/wpt/tests/test_browser.py
index 4c68d75..d1d31e5 100644
--- a/tools/wpt/tests/test_browser.py
+++ b/tools/wpt/tests/test_browser.py
@@ -64,15 +64,15 @@
     webdriver_binary = '/usr/bin/edgedriver'
 
     # Working cases.
-    mocked_call.return_value = 'MSEdgeDriver 84.0.4147.30'
+    mocked_call.return_value = 'Microsoft Edge WebDriver 84.0.4147.30'
     assert edge.webdriver_version(webdriver_binary) == '84.0.4147.30'
-    mocked_call.return_value = 'MSEdgeDriver 87.0.1 (abcd1234-refs/branch-heads/4147@{#310})'
+    mocked_call.return_value = 'Microsoft Edge WebDriver 87.0.1 (abcd1234-refs/branch-heads/4147@{#310})'
     assert edge.webdriver_version(webdriver_binary) == '87.0.1'
 
     # Various invalid version strings
     mocked_call.return_value = 'Edge 84.0.4147.30 (dev)'
     assert edge.webdriver_version(webdriver_binary) is None
-    mocked_call.return_value = 'MSEdgeDriver New 84.0.4147.30'
+    mocked_call.return_value = 'Microsoft Edge WebDriver New 84.0.4147.30'
     assert edge.webdriver_version(webdriver_binary) is None
     mocked_call.return_value = ''
     assert edge.webdriver_version(webdriver_binary) is None