Extract Safari version from safaridriver

web-platform-tests · Oct 23, 2018 · a35a216 · a35a216
1 parent a252e9f
commit a35a216
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/tools/wpt/browser.py b/tools/wpt/browser.py
@@ -46,7 +46,7 @@ def find_webdriver(self, channel=None):
         return NotImplemented
 
     @abstractmethod
-    def version(self, binary=None):
+    def version(self, binary=None, webdriver_binary=None):
         """Retrieve the release version of the installed browser."""
         return NotImplemented
 
@@ -366,8 +366,7 @@ def install_geckodriver_nightly(self, dest):
             os.unlink(package_path)
 
         return path
-
-    def version(self, binary=None):
+    def version(self, binary=None, webdriver_binary=None):
         """Retrieve the release version of the installed browser."""
         version_string = call(binary, "--version").strip()
         m = re.match(r"Mozilla Firefox (.*)", version_string)
@@ -394,7 +393,7 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary=None):
+    def version(self, binary=None, webdriver_binary=None):
         return None
 
 
@@ -458,7 +457,7 @@ def install_webdriver(self, dest=None, channel=None):
         os.chmod(path, st.st_mode | stat.S_IEXEC)
         return path
 
-    def version(self, binary=None):
+    def version(self, binary=None, webdriver_binary=None):
         binary = binary or self.binary
         if uname[0] != "Windows":
             try:
@@ -497,7 +496,7 @@ def install_webdriver(self, dest=None, channel=None):
         chrome = Chrome()
         return chrome.install_webdriver(dest, channel)
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         return None
 
 class Opera(Browser):
@@ -562,7 +561,7 @@ def install_webdriver(self, dest=None, channel=None):
         os.chmod(path, st.st_mode | stat.S_IEXEC)
         return path
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         """Retrieve the release version of the installed browser."""
         binary = binary or self.binary
         try:
@@ -593,7 +592,7 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         return None
 
 
@@ -619,7 +618,7 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         return None
 
 
@@ -647,10 +646,21 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
+        if webdriver_binary is not None:
+            try:
+                output = call(webdriver_binary, "--version").strip()
+                # TODO: explain
+                if output.startswith('Included with '):
+                    output = output[14:]
+                return output
+            except subprocess.CalledProcessError:
+                # TODO stderr gets printed :'(
+                pass
+        # TODO: this message doesn't show up anywhere
+        logger.warn("Unable to determine Safari version.")
         return None
 
-
 class SafariWebDriver(Safari):
     product = "safari_webdriver"
 
@@ -707,7 +717,7 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         """Retrieve the release version of the installed browser."""
         output = call(binary, "--version")
         m = re.search(r"Servo ([0-9\.]+-[a-f0-9]+)?(-dirty)?$", output.strip())
@@ -737,7 +747,7 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         return None
 
 
@@ -759,5 +769,5 @@ def find_webdriver(self, channel=None):
     def install_webdriver(self, dest=None, channel=None):
         raise NotImplementedError
 
-    def version(self, binary):
+    def version(self, binary=None, webdriver_binary=None):
         return None
diff --git a/tools/wpt/run.py b/tools/wpt/run.py
@@ -507,7 +507,8 @@ def setup_wptrunner(venv, prompt=True, install_browser=False, **kwargs):
 
     venv.install_requirements(os.path.join(wptrunner_path, "requirements.txt"))
 
-    kwargs['browser_version'] = setup_cls.browser.version(kwargs.get("binary"))
+    kwargs['browser_version'] = setup_cls.browser.version(binary=kwargs.get("binary"),
+                                                          webdriver_binary=kwargs.get("webdriver_binary"))
     return kwargs