Merge remote-tracking branch 'origin/master' into sentinel

Author: djanowski

test/internals_test.rb

@@ -379,7 +379,7 @@ def af_family_supported(af)
           begin
             sa = Socket.pack_sockaddr_in(1024 + Random.rand(63076), hosts[af])
             s.bind(sa)
-          rescue Errno::EADDRINUSE => e
+          rescue Errno::EADDRINUSE
             tries -= 1
             retry if tries > 0
 

test/publish_subscribe_test.rb

@@ -191,7 +191,7 @@ def test_unsubscribe_without_a_subscribe
   def test_subscribe_past_a_timeout
     # For some reason, a thread here doesn't reproduce the issue.
     sleep = %{sleep #{OPTIONS[:timeout] * 2}}
-    publish = %{echo "publish foo bar\r\n" | nc 127.0.0.1 #{OPTIONS[:port]}}
+    publish = %{ruby -rsocket -e 't=TCPSocket.new("127.0.0.1",#{OPTIONS[:port]});t.write("publish foo bar\\r\\n");t.read(4);t.close'}
     cmd = [sleep, publish].join("; ")
 
     IO.popen(cmd, "r+") do |pipe|