rb: Allow to start multiple Safari drivers in parallel

p0deje · p0deje · commit 94a787fb54e0 · 2015-11-03T10:10:27.000+06:00
diff --git a/rb/lib/selenium/webdriver/safari/bridge.rb b/rb/lib/selenium/webdriver/safari/bridge.rb
@@ -104,7 +104,7 @@ def camel_case(str)
 
         def prepare_connect_file
           # TODO: use tempfile?
-          path = File.join(Dir.tmpdir, "safaridriver-#{Time.now.to_i}.html")
+          path = File.join(Dir.tmpdir, "safaridriver-#{Time.now.usec}.html")
 
           File.open(path, 'w') do |io|
             io << "<!DOCTYPE html><script>window.location = '#{@server.uri}';</script>"
diff --git a/rb/lib/selenium/webdriver/safari/browser.rb b/rb/lib/selenium/webdriver/safari/browser.rb
@@ -23,6 +23,8 @@ module Safari
 
       class Browser
         def start(*args)
+          Platform.exit_hook { stop } # make sure we don't leave the browser running
+
           @process = ChildProcess.new(Safari.path, *args)
           @process.io.inherit! if $DEBUG
           @process.start
diff --git a/rb/lib/selenium/webdriver/safari/options.rb b/rb/lib/selenium/webdriver/safari/options.rb
@@ -21,6 +21,8 @@ module Selenium
   module WebDriver
     module Safari
       class Options
+        DEFAULT_PORT = 56485
+
         attr_accessor :port, :data_dir, :skip_extension_installation
 
         def initialize(opts = {})
@@ -40,16 +42,16 @@ def to_capabilities
 
         def as_json
           {
-            'port'                      => port,
-            'dataDir'                   => data_dir,
-            'cleanSession'              => clean_session?,
+            'port'         => port,
+            'dataDir'      => data_dir,
+            'cleanSession' => clean_session?,
           }
         end
 
         private
 
         def extract_options(opts)
-          @port          = Integer(opts[:port] || PortProber.random)
+          @port          = Integer(opts[:port] || DEFAULT_PORT)
           @data_dir      = opts[:custom_data_dir] || opts[:data_dir]
           @clean_session = opts[:clean_session]
         end
diff --git a/rb/lib/selenium/webdriver/safari/server.rb b/rb/lib/selenium/webdriver/safari/server.rb
@@ -22,13 +22,20 @@ module WebDriver
     module Safari
 
       class Server
+        SOCKET_LOCK_TIMEOUT = 45
+
         def initialize(port, command_timeout)
-          @port  = port
+          @port = port
           @command_timeout = command_timeout
         end
 
         def start
-          @server = TCPServer.new(Platform.localhost, @port)
+          Platform.exit_hook { stop } # make sure we don't leave the server running
+
+          socket_lock.locked do
+            find_free_port
+            start_server
+          end
         end
 
         def stop
@@ -158,6 +165,20 @@ def encode_form_component(str)
           end
         end
 
+        private
+
+        def start_server
+          @server = TCPServer.new(Platform.localhost, @port)
+        end
+
+        def find_free_port
+          @port = PortProber.above @port
+        end
+
+        def socket_lock
+          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
+        end
+
       end # Server
     end # Safari
   end # WebDriver
