lib/selenium/webdriver/common/port_prober.rb in selenium-webdriver-2.22.0.rc1 vs lib/selenium/webdriver/common/port_prober.rb in selenium-webdriver-2.22.0.rc2

@@ -3,23 +3,32 @@
     class PortProber
       def self.above(port)
         port += 1 until free? port
         port
       end
-      
+
       def self.random
+        # TODO: Avoid this
+        #
+        # (a) should pick a port that's guaranteed to be free on all interfaces
+        # (b) should pick a random port outside the ephemeral port range
+        #
         server = TCPServer.new(Platform.localhost, 0)
         port   = server.addr[1]
         server.close
-        
+
         port
       end
-      
+
       def self.free?(port)
-        TCPServer.new(Platform.localhost, port).close
+        interfaces = Socket.getaddrinfo("localhost", port).map { |e| e[2] }
+        interfaces += ["0.0.0.0", Platform.ip]
+        interfaces.each { |address| TCPServer.new(address, port).close }
+
         true
       rescue SocketError, Errno::EADDRINUSE
         false
       end
+
     end # PortProber
   end # WebDriver
 end # Selenium