Make code clearer and more explicit in SocketSpecs

* Remove the rescue-all SocketSpecs.wait_until_success and
  simplify SocketSpecs.loop_with_timeout.

Author: eregon

spec/ruby/library/socket/fixtures/classes.rb

@@ -72,24 +72,11 @@ def self.each_ip_protocol
   end
 
   def self.loop_with_timeout(timeout = TIME_TOLERANCE)
-    require 'timeout'
-    time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-    loop do
-      if Process.clock_gettime(Process::CLOCK_MONOTONIC) - time >= timeout
-        raise TimeoutError, "Did not succeed within #{timeout} seconds"
-      end
-
-      sleep 0.01 # necessary on OSX; don't know why
-      yield
-    end
-  end
-
-  def self.wait_until_success(timeout = TIME_TOLERANCE)
-    loop_with_timeout(timeout) do
-      begin
-        return yield
-      rescue
+    while yield == :retry
+      if Process.clock_gettime(Process::CLOCK_MONOTONIC) - start >= timeout
+        raise RuntimeError, "Did not succeed within #{timeout} seconds"
       end
     end
   end

spec/ruby/library/socket/socket/tcp_server_loop_spec.rb

@@ -31,8 +31,13 @@
         end
       end
 
-      SocketSpecs.wait_until_success do
-        @client.connect(Socket.sockaddr_in(@port, '127.0.0.1'))
+      SocketSpecs.loop_with_timeout do
+        begin
+          @client.connect(Socket.sockaddr_in(@port, '127.0.0.1'))
+        rescue SystemCallError
+          sleep 0.01
+          :retry
+        end
       end
 
       # At this point the connection has been set up but the thread may not yet

spec/ruby/library/socket/socket/udp_server_loop_spec.rb

@@ -35,9 +35,17 @@
       @client.connect(Socket.sockaddr_in(@port, '127.0.0.1'))
 
       SocketSpecs.loop_with_timeout do
-        SocketSpecs.wait_until_success { @client.write('hello') }
-
-        break if msg
+        begin
+          @client.write('hello')
+        rescue SystemCallError
+          sleep 0.01
+          :retry
+        else
+          unless msg
+            sleep 0.001
+            :retry
+          end
+        end
       end
 
       msg.should == 'hello'

spec/ruby/library/socket/socket/unix_server_loop_spec.rb

@@ -39,7 +39,14 @@
           end
         end
 
-        @client = SocketSpecs.wait_until_success { Socket.unix(@path) }
+        SocketSpecs.loop_with_timeout do
+          begin
+            @client = Socket.unix(@path)
+          rescue SystemCallError
+            sleep 0.01
+            :retry
+          end
+        end
 
         thread.join(2)