py: default Safari to use safaridriver from apple if it exists, add 'use_legacy' to Safari constructor to force the old way (not sure if it would even work, but leaving the option open)

Author: lukeis

py/selenium/webdriver/safari/service.py

@@ -15,73 +15,50 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from os import devnull
-import subprocess
-import time
-from selenium.common.exceptions import WebDriverException
-from selenium.webdriver.common import utils
+import os
+from selenium.webdriver.common import service, utils
+from subprocess import PIPE
 
-
-class Service(object):
+class Service(service.Service):
     """
     Object that manages the starting and stopping of the SafariDriver
     """
 
-    def __init__(self, executable_path, port=0, quiet=False):
+    def __init__(self, executable_path=None, port=0, quiet=False, use_legacy=False):
         """
         Creates a new instance of the Service
 
         :Args:
          - executable_path : Path to the SafariDriver
          - port : Port the service is running on """
 
-        self.port = port
-        self.path = executable_path
-        if self.port == 0:
-            self.port = utils.free_port()
+        if not use_legacy and os.path.exists('/usr/bin/safaridriver'):
+          path = '/usr/bin/safaridriver'
+          self.legacy_driver = False
+        else:
+          path = 'java'
+          self.standalone_jar = executable_path
+          self.legacy_driver = True
+        if port == 0:
+            port = utils.free_port()
         self.quiet = quiet
+        log = PIPE
+        if quiet:
+            log = open(os.devnull, 'w')
+        service.Service.__init__(self, path, port, log)
 
-    def start(self):
-        """
-        Starts the SafariDriver Service.
-
-        :Exceptions:
-         - WebDriverException : Raised either when it can't start the service
-           or when it can't connect to the service
-        """
-        kwargs = dict()
-        if self.quiet:
-            devnull_out = open(devnull, 'w')
-            kwargs.update(stdout=devnull_out,
-                          stderr=devnull_out)
-        try:
-            self.process = subprocess.Popen(["java", "-jar", self.path, "-port", "%s" % self.port],
-                                            **kwargs)
-        except:
-            raise WebDriverException(
-                "SafariDriver executable needs to be available in the path.")
-        time.sleep(10)
-        count = 0
-        while not utils.is_connectable(self.port):
-            count += 1
-            time.sleep(1)
-            if count == 30:
-                raise WebDriverException("Can not connect to the SafariDriver")
+    def command_line_args(self):
+        if self.legacy_driver:
+          return ["-jar", self.standalone_jar, "-port", "%s" % self.port]
+        return ["-p", "%s" % self.port]
 
     @property
     def service_url(self):
         """
         Gets the url of the SafariDriver Service
         """
-        return "http://localhost:%d/wd/hub" % self.port
-
-    def stop(self):
-        """
-        Tells the SafariDriver to stop and cleans up the process
-        """
-        # If it's dead don't worry
-        if self.process is None:
-            return
+        if not self.legacy_driver:
+          return "http://localhost:%d" % self.port
+        else:
+          return "http://localhost:%d/wd/hub" % self.port
 
-        self.process.kill()
-        self.process.wait()

py/selenium/webdriver/safari/webdriver.py

@@ -33,7 +33,7 @@ class WebDriver(RemoteWebDriver):
     """
 
     def __init__(self, executable_path=None, port=0,
-                 desired_capabilities=DesiredCapabilities.SAFARI, quiet=False):
+                 desired_capabilities=DesiredCapabilities.SAFARI, quiet=False, use_legacy_driver=False):
         """
         Creates a new instance of the Safari driver.
 
@@ -45,13 +45,9 @@ def __init__(self, executable_path=None, port=0,
          - port - port you would like the service to run, if left as 0, a free port will be found.
          - desired_capabilities: Dictionary object with desired capabilities (Can be used to provide various Safari switches).
         """
-        if executable_path is None:
-            try:
-                executable_path = os.environ["SELENIUM_SERVER_JAR"]
-            except:
-                raise Exception("No executable path given, please add one to Environment Variable \
-                'SELENIUM_SERVER_JAR'")
-        self.service = Service(executable_path, port=port, quiet=quiet)
+        if not executable_path is None:
+	    executable_path = os.environ.get("SELENIUM_SERVER_JAR")
+        self.service = Service(executable_path, port=port, quiet=quiet, use_legacy=use_legacy_driver)
         self.service.start()
 
         RemoteWebDriver.__init__(