selenium-webdriver 0.0.19 → 0.0.20

data/chrome/src/rb/lib/selenium/webdriver/chrome/bridge.rb

@@ -31,7 +31,7 @@ module Selenium
           end
 
           @executor.close
-          @launcher.kill
+          @launcher.quit
         end
 
         def getScreenshot

data/chrome/src/rb/lib/selenium/webdriver/chrome/launcher.rb

@@ -38,8 +38,8 @@ module Selenium
           pid
         end
 
-        def kill
-          @process.kill
+        def quit
+          @process.ensure_death
         end
 
         private

data/common/src/rb/CHANGES

@@ -1,3 +1,8 @@
+2010-06-03
+==========
+
+* Fix bug where Firefox would hang on quit().
+
 2010-05-31
 ==========
 

data/common/src/rb/lib/selenium/webdriver/child_process.rb

@@ -23,11 +23,14 @@ module Selenium
       end
 
       def ugly_death?
-        code = exit_value()
-        # if exit_val is nil, the process is still alive
+        code = exit_value
         code && code != 0
       end
 
+      #
+      # Returns the exit value of the process, or nil if it's still alive.
+      #
+
       def exit_value
         pid, status = Process.waitpid2(@pid, Process::WNOHANG)
         status.exitstatus if pid
@@ -45,6 +48,52 @@ module Selenium
         self
       end
 
+      #
+      # Tries increasingly harsher methods to make the process die within
+      # a reasonable time
+      #
+
+      def ensure_death
+        begin
+          $stderr.puts "wait_nonblock(5) -> #{self}" if $DEBUG
+          return wait_nonblock(5)
+        rescue Error::TimeOutError
+          # try next
+        end
+
+        $stderr.puts "TERM -> #{self}" if $DEBUG
+        kill
+
+        begin
+          $stderr.puts "wait_nonblock(5) -> #{self}" if $DEBUG
+          return wait_nonblock(5)
+        rescue Error::TimeOutError
+          # try next
+        end
+
+        $stderr.puts "KILL -> #{self}" if $DEBUG
+        kill!
+
+        $stderr.puts "wait_nonblock(5) -> #{self}" if $DEBUG
+        wait_nonblock(5)
+      rescue Errno::ECHILD
+        # great!
+        true
+      end
+
+      def wait_nonblock(timeout)
+        end_time = Time.now + timeout
+        until Time.now > end_time || exited = exit_value
+          sleep 0.1
+        end
+
+        unless exited
+          raise Error::TimeOutError, "process still alive after #{timeout} seconds"
+        end
+
+        exited
+      end
+
       def wait
         assert_started
         Process.waitpid2 @pid
@@ -76,6 +125,13 @@ module Selenium
 
           self
         end
+        
+        def wait_nonblock(timeout)
+          return super if defined?(Process::WNOHANG) 
+          Timeout.timeout(timeout, Error::TimeOutError) { wait }
+        rescue Process::Error
+          # no handle, great
+        end
 
         def kill
           kill!
@@ -84,6 +140,7 @@ module Selenium
 
       module JRubyProcess
         def start
+          require 'java'
           pb = java.lang.ProcessBuilder.new(@args)
 
           env = pb.environment

data/firefox/src/rb/lib/selenium/webdriver/firefox.rb

@@ -5,7 +5,6 @@ require "selenium/webdriver/firefox/util"
 require "selenium/webdriver/firefox/binary"
 require "selenium/webdriver/firefox/profiles_ini"
 require "selenium/webdriver/firefox/profile"
-require "selenium/webdriver/firefox/extension_connection"
 require "selenium/webdriver/firefox/launcher"
 require "selenium/webdriver/firefox/bridge"
 
@@ -17,7 +16,7 @@ module Selenium
 
       DEFAULT_PROFILE_NAME            = "WebDriver".freeze
       DEFAULT_PORT                    = 7055
-      DEFAULT_ENABLE_NATIVE_EVENTS    = [:windows, :linux].include? Platform.os
+      DEFAULT_ENABLE_NATIVE_EVENTS    = Platform.os == :windows
       DEFAULT_SECURE_SSL              = false
       DEFAULT_ASSUME_UNTRUSTED_ISSUER = true
       DEFAULT_LOAD_NO_FOCUS_LIB       = Platform.os == :linux

data/firefox/src/rb/lib/selenium/webdriver/firefox/binary.rb

@@ -49,6 +49,10 @@ module Selenium
           end
         end
 
+        def quit
+          @process.ensure_death if @process
+        end
+
         def kill
           @process.kill if @process
         end
@@ -95,7 +99,7 @@ module Selenium
             lm = Win32::Registry::HKEY_LOCAL_MACHINE
             lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox") do |reg|
               main = lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{reg.keys[0]}\\Main")
-              if entry = main.find {|key, type, data| key =~ /pathtoexe/i}
+              if entry = main.find { |key, type, data| key =~ /pathtoexe/i }
                 return entry.last
               end
             end

data/firefox/src/rb/lib/selenium/webdriver/firefox/bridge.rb

@@ -18,7 +18,7 @@ module Selenium
           end
 
           @launcher.launch
-          super :url => @launcher.connection.url, :desired_capabilities => :firefox
+          super :url => @launcher.url, :desired_capabilities => :firefox
         end
 
         def browser
@@ -31,7 +31,7 @@ module Selenium
 
         def quit
           super
-          @binary.wait rescue nil # might raise on windows
+          @binary.quit
 
           nil
         end

data/firefox/src/rb/lib/selenium/webdriver/firefox/launcher.rb

@@ -7,8 +7,8 @@ module Selenium
       # @private
       class Launcher
 
-        attr_reader :binary, :connection
-        SOCKET_LOCK_TIMEOUT = 45
+        SOCKET_LOCK_TIMEOUT       = 45
+        STABLE_CONNECTION_TIMEOUT = 60
 
         def initialize(binary, port = DEFAULT_PORT, profile = DEFAULT_PROFILE_NAME)
           @binary       = binary
@@ -30,6 +30,10 @@ module Selenium
           @host = "127.0.0.1"
         end
 
+        def url
+          "http://#{@host}:#{@port}/hub"
+        end
+
         def launch
           with_lock do
             find_free_port
@@ -59,8 +63,7 @@ module Selenium
             end
           end
 
-          raise Error::WebDriverError,
-            "Unable to bind to locking port #{locking_port} within #{SOCKET_LOCK_TIMEOUT} seconds"
+          raise Error::WebDriverError, "unable to bind to locking port #{locking_port} within #{SOCKET_LOCK_TIMEOUT} seconds"
         ensure
           socket_lock.close if socket_lock
         end
@@ -100,28 +103,23 @@ module Selenium
           @binary.wait
         end
 
-        def connect
-          @connection = ExtensionConnection.new(@host, @port)
-          @connection.connect(5)
-        end
-
         def connect_until_stable
-          max_time = Time.now + 60
+          max_time = Time.now + STABLE_CONNECTION_TIMEOUT
 
           until Time.now >= max_time
-            begin
-              connection = ExtensionConnection.new(@host, @port)
-              connection.connect(1)
-
-              connect
-              return
-            rescue Timeout::Error => e
-              puts "#{self} caught #{e.message}" if $DEBUG
-              # ok
-            end
+            return if can_connect?
+            sleep 0.25
           end
 
-          raise Error::WebDriverError, "unable to obtain stable firefox connection"
+          raise Error::WebDriverError, "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds"
+        end
+
+        def can_connect?
+          TCPSocket.new(@host, @port).close
+          true
+        rescue Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError => e
+          $stderr.puts "#{e.message} for #{@host}:#{@port}" if $DEBUG
+          false
         end
 
         def free_port?(port)

data/firefox/src/rb/lib/selenium/webdriver/firefox/profile.rb

@@ -6,7 +6,7 @@ module Selenium
         ANONYMOUS_PROFILE_NAME = "WEBDRIVER_ANONYMOUS_PROFILE"
         EXTENSION_NAME         = "fxdriver@googlecode.com"
         EM_NAMESPACE_URI       = "http://www.mozilla.org/2004/em-rdf#"
-        NO_FOCUS_LIBRARY_NAME  = "x_ignore_nofocus.so"
+        NO_FOCUS_LIBRARY_NAME  = "libnoblur.so"
 
         DEFAULT_EXTENSION_SOURCE = File.expand_path("#{WebDriver.root}/firefox/src/extension")
 
@@ -16,15 +16,19 @@ module Selenium
           ["#{WebDriver.root}/firefox/prebuilt/nsIResponseHandler.xpt", "components/nsIResponseHandler.xpt"],
         ]
 
-        NATIVE_WINDOWS = ["#{WebDriver.root}/firefox/prebuilt/Win32/Release/webdriver-firefox.dll", "platform/WINNT_x86-msvc/components/webdriver-firefox.dll"]
+        NATIVE_WINDOWS = [
+          "#{WebDriver.root}/firefox/prebuilt/Win32/Release/webdriver-firefox.dll",
+          "platform/WINNT_x86-msvc/components/webdriver-firefox.dll"
+        ]
+
         NATIVE_LINUX   = [
           ["#{WebDriver.root}/firefox/prebuilt/linux/Release/libwebdriver-firefox.so", "platform/Linux_x86-gcc3/components/libwebdriver-firefox.so"],
           ["#{WebDriver.root}/firefox/prebuilt/linux64/Release/libwebdriver-firefox.so", "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox.so"]
         ]
 
         NO_FOCUS = [
-          ["#{WebDriver.root}/firefox/prebuilt/linux64/Release/x_ignore_nofocus.so", "amd64/x_ignore_nofocus.so"],
-          ["#{WebDriver.root}/firefox/prebuilt/linux/Release/x_ignore_nofocus.so", "x86/x_ignore_nofocus.so"],
+          ["#{WebDriver.root}/firefox/prebuilt/amd64/libnoblur64.so", "amd64/#{NO_FOCUS_LIBRARY_NAME}"],
+          ["#{WebDriver.root}/firefox/prebuilt/i386/libnoblur.so", "x86/#{NO_FOCUS_LIBRARY_NAME}"],
         ]
 
         SHARED = [
@@ -288,4 +292,4 @@ module Selenium
       end # Profile
     end # Firefox
   end # WebDriver
-end # Selenium
+end # Selenium

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 19
-  version: 0.0.19
+    - 20
+  version: 0.0.20
 platform: ruby
 authors: 
   - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -210,7 +210,6 @@ files:
   - firefox/src/rb/lib/selenium/webdriver/firefox.rb
   - firefox/src/rb/lib/selenium/webdriver/firefox/binary.rb
   - firefox/src/rb/lib/selenium/webdriver/firefox/bridge.rb
-  - firefox/src/rb/lib/selenium/webdriver/firefox/extension_connection.rb
   - firefox/src/rb/lib/selenium/webdriver/firefox/launcher.rb
   - firefox/src/rb/lib/selenium/webdriver/firefox/profile.rb
   - firefox/src/rb/lib/selenium/webdriver/firefox/profiles_ini.rb
@@ -243,10 +242,10 @@ files:
   - firefox/prebuilt/nsICommandProcessor.xpt
   - firefox/prebuilt/nsINativeEvents.xpt
   - firefox/prebuilt/nsIResponseHandler.xpt
+  - firefox/prebuilt/amd64/libnoblur64.so
+  - firefox/prebuilt/i386/libnoblur.so
   - firefox/prebuilt/linux/Release/libwebdriver-firefox.so
-  - firefox/prebuilt/linux/Release/x_ignore_nofocus.so
   - firefox/prebuilt/linux64/Release/libwebdriver-firefox.so
-  - firefox/prebuilt/linux64/Release/x_ignore_nofocus.so
   - firefox/prebuilt/Win32/Release/webdriver-firefox.dll
   - chrome/src/rb/lib/selenium/webdriver/chrome.rb
   - chrome/src/rb/lib/selenium/webdriver/chrome/bridge.rb

data/firefox/src/rb/lib/selenium/webdriver/firefox/extension_connection.rb

@@ -1,33 +0,0 @@
-module Selenium
-  module WebDriver
-    module Firefox
-
-      # @private
-      class ExtensionConnection
-
-        def initialize(host, port)
-          @host = host
-          @port = port
-        end
-
-        def url
-          "http://#{@host}:#{@port}/hub"
-        end
-
-        def connect(timeout = 20)
-          Timeout.timeout(timeout) {
-            loop do
-              begin
-                return TCPSocket.new(@host, @port).close
-              rescue Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError => e
-                $stderr.puts "#{self} caught #{e.message} for #{@host}:#{@port}" if $DEBUG
-                sleep 0.25
-              end
-            end
-          }
-        end
-
-      end # ExtensionConnection
-    end # Firefox
-  end # WebDriver
-end # Selenium