Do at_exit first to make sure server is always killed, also put a sel…

…ect in so it fails a bit more gracefully after 10 seconds if something goes wrong with the server
petRUShka · May 30, 2011 · 13fe01c · 13fe01c
1 parent d0cf8f8
commit 13fe01c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/capybara/driver/webkit/browser.rb b/lib/capybara/driver/webkit/browser.rb
@@ -72,10 +72,11 @@ def start_server
         read_pipe.close
         exec(server_path)
       end
+      at_exit { Process.kill("INT", @pid) }
+
       write_pipe.close
+      return unless IO.select([read_pipe], nil, nil, 10)
       @server_port = ((read_pipe.first || '').match(/listening on port: (\d+)/) || [])[1]
-
-      at_exit { Process.kill("INT", @pid) }
     end
 
     def connect