selenium-webdriver 0.0.5 → 0.0.6

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

@@ -54,6 +54,7 @@ module Selenium
         def quit
           @launcher.kill # FIXME: let chrome extension take care of this
           execute :request => 'quit'
+          @executor.close
         end
 
         def close

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

@@ -28,6 +28,11 @@ module Selenium
          JSON.parse read_response(@queue.pop)
        end
 
+       def close
+         @server.close
+       rescue IOError
+       end
+
        private
 
        def start_run_loop
@@ -42,6 +47,8 @@ module Selenium
 
            @accepted_any ||= true
          end
+       rescue IOError => e
+         raise e unless @server.closed?
        end
 
        def read_response(socket)

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

@@ -50,6 +50,7 @@ module Selenium
         end
 
         def create_profile
+          touch "#{tmp_profile_dir}/First Run"
           touch "#{tmp_profile_dir}/First Run Dev"
         end
 

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

@@ -6,6 +6,8 @@ module Selenium
     #
 
     class ChildProcess
+      attr_reader :pid
+
       def initialize(*args)
         @args = args
 
@@ -16,14 +18,15 @@ module Selenium
         end
       end
 
-      def alive?
-        return false unless @pid
+      def ugly_death?
+        code = exit_value()
+        # if exit_val is nil, the process is still alive
+        code && code != 0
+      end
 
-        # TODO: check if this works on windows
-        Process.kill 0, @pid
-        true
-      rescue Errno::ESRCH
-        false
+      def exit_value
+        pid, status = Process.waitpid2(@pid, Process::WNOHANG)
+        status.exitstatus if pid
       end
 
       def start
@@ -34,7 +37,7 @@ module Selenium
 
       def wait
         raise "called wait with no pid" unless @pid
-        Process.waitpid @pid
+        Process.waitpid2 @pid
       end
 
       def kill
@@ -78,6 +81,12 @@ module Selenium
         def wait
           @process.waitFor
         end
+
+        def exit_value
+          @process.exitValue
+        rescue java.lang.IllegalThreadStateException
+          nil
+        end
       end
 
     end # ChildProcess

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

@@ -59,6 +59,10 @@ module Selenium
         os == :windows
       end
 
+      def mac?
+        os == :macosx
+      end
+
       def wrap_in_quotes_if_necessary(str)
         win? ? %{"#{str}"} : str
       end

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

@@ -2,6 +2,7 @@ module Selenium
   module WebDriver
     module Firefox
       class Binary
+
         def initialize
           ENV['MOZ_NO_REMOTE'] = '1' # able to launch multiple instances
           check_binary_exists
@@ -9,10 +10,14 @@ module Selenium
 
         def create_base_profile(name)
           execute("-CreateProfile", name)
-          Timeout.timeout(15, Error::TimeOutError) { wait }
 
-          unless $?.success?
-            raise Error::WebDriverError, "could not create base profile: (#{$?.exitstatus})"
+          status = nil
+          Timeout.timeout(15, Error::TimeOutError) do
+            _, status = wait
+          end
+
+          if status && !status.success?
+            raise Error::WebDriverError, "could not create base profile: (exit status: #{status.exitstatus})"
           end
         end
 
@@ -25,6 +30,7 @@ module Selenium
           # end
 
           execute(*args)
+          cope_with_mac_strangeness(args) if Platform.mac?
         end
 
         def execute(*extra_args)
@@ -32,6 +38,22 @@ module Selenium
           @process = ChildProcess.new(*args).start
         end
 
+        def cope_with_mac_strangeness(args)
+          sleep 0.3
+
+          if @process.ugly_death?
+            # process crashed, trying a restart. sleeping 5 seconds shorter than the java driver
+            sleep 5
+            execute(*args)
+          end
+
+          # ensure we're ok
+          sleep 0.3
+          if @process.ugly_death?
+            raise Error::WebDriverError, "Unable to start Firefox cleanly, args: #{args.inspect}, status: #{status.inspect}"
+          end
+        end
+
         def kill
           @process.kill if @process
         end
@@ -40,6 +62,10 @@ module Selenium
           @process.wait if @process
         end
 
+        def pid
+          @process.pid if @process
+        end
+
         private
 
         def path

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

@@ -15,7 +15,7 @@ module Selenium
                 return new_socket
               rescue Errno::ECONNREFUSED, Errno::ENOTCONN => e
                 $stderr.puts "#{self} caught #{e.message}" if $DEBUG
-                sleep 0.250
+                sleep 0.25
               end
             end
           }

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

@@ -94,6 +94,7 @@ module Selenium
               connect
               return
             rescue Timeout::Error => e
+              puts "#{self} caught #{e.message}" if $DEBUG
               # ok
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency