Merge pull request #562 from redis/addrinuse-fix

Addrinuse fix

Author: djanowski

test/sentinel_test.rb

@@ -24,8 +24,10 @@ def test_sentinel_connection
       }
     end
 
-    RedisMock.start(handler.call(:s1), {}, 26381) do
-      RedisMock.start(handler.call(:s2), {}, 26382) do
+    RedisMock.start(handler.call(:s1), {}, 0) do |s1_port|
+      RedisMock.start(handler.call(:s2), {}, 0) do |s2_port|
+        sentinels[0][:port] = s1_port
+        sentinels[1][:port] = s2_port
         redis = Redis.new(:url => "redis://master1", :sentinels => sentinels, :role => :master)
 
         assert redis.ping
@@ -59,8 +61,10 @@ def test_sentinel_failover
       end
     }
 
-    RedisMock.start(s1, {}, 26381) do
-      RedisMock.start(s2, {}, 26382) do
+    RedisMock.start(s1, {}, 0) do |s1_port|
+      RedisMock.start(s2, {}, 0) do |s2_port|
+        sentinels[0][:port] = s1_port
+        sentinels[1][:port] = s2_port
         redis = Redis.new(:url => "redis://master1", :sentinels => sentinels, :role => :master)
 
         assert redis.ping
@@ -94,8 +98,10 @@ def test_sentinel_failover_prioritize_healthy_sentinel
       end
     }
 
-    RedisMock.start(s1, {}, 26381) do
-      RedisMock.start(s2, {}, 26382) do
+    RedisMock.start(s1, {}, 0) do |s1_port|
+      RedisMock.start(s2, {}, 0) do |s2_port|
+        sentinels[0][:port] = s1_port
+        sentinels[1][:port] = s2_port
         redis = Redis.new(:url => "redis://master1", :sentinels => sentinels, :role => :master)
 
         assert redis.ping
@@ -118,20 +124,22 @@ def test_sentinel_with_non_sentinel_options
       :m1 => []
     }
 
-    sentinel = {
-      :auth => lambda do |pass|
-        commands[:s1] << ["auth", pass]
-        "-ERR unknown command 'auth'"
-      end,
-      :select => lambda do |db|
-        commands[:s1] << ["select", db]
-        "-ERR unknown command 'select'"
-      end,
-      :sentinel => lambda do |command, *args|
-        commands[:s1] << [command, *args]
-        ["127.0.0.1", "6382"]
-      end
-    }
+    sentinel = lambda do |port|
+      {
+        :auth => lambda do |pass|
+          commands[:s1] << ["auth", pass]
+          "-ERR unknown command 'auth'"
+        end,
+        :select => lambda do |db|
+          commands[:s1] << ["select", db]
+          "-ERR unknown command 'select'"
+        end,
+        :sentinel => lambda do |command, *args|
+          commands[:s1] << [command, *args]
+          ["127.0.0.1", port.to_s]
+        end
+      }
+    end
 
     master = {
       :auth => lambda do |pass|
@@ -144,8 +152,9 @@ def test_sentinel_with_non_sentinel_options
       end
     }
 
-    RedisMock.start(master, {}, 6382) do
-      RedisMock.start(sentinel, {}, 26381) do
+    RedisMock.start(master, {}, 0) do |master_port|
+      RedisMock.start(sentinel.call(master_port), {}, 0) do |sen_port|
+        sentinels[0][:port] = sen_port
         redis = Redis.new(:url => "redis://:foo@master1/15", :sentinels => sentinels, :role => :master)
 
         assert redis.ping
@@ -159,11 +168,13 @@ def test_sentinel_with_non_sentinel_options
   def test_sentinel_role_mismatch
     sentinels = [{:host => "127.0.0.1", :port => 26381}]
 
-    sentinel = {
-      :sentinel => lambda do |command, *args|
-        ["127.0.0.1", "6382"]
-      end
-    }
+    sentinel = lambda do |port|
+      {
+        :sentinel => lambda do |command, *args|
+          ["127.0.0.1", port.to_s]
+        end
+      }
+    end
 
     master = {
       :role => lambda do
@@ -172,8 +183,9 @@ def test_sentinel_role_mismatch
     }
 
     ex = assert_raise(Redis::ConnectionError) do
-      RedisMock.start(master, {}, 6382) do
-        RedisMock.start(sentinel, {}, 26381) do
+      RedisMock.start(master, {}, 0) do |master_port|
+        RedisMock.start(sentinel.call(master_port), {}, 0) do |sen_port|
+          sentinels[0][:port] = sen_port
           redis = Redis.new(:url => "redis://master1", :sentinels => sentinels, :role => :master)
 
           assert redis.ping
@@ -190,15 +202,15 @@ def test_sentinel_retries
 
     connections = []
 
-    handler = lambda do |id|
+    handler = lambda do |id, port|
       {
         :sentinel => lambda do |command, *args|
           connections << id
 
           if connections.count(id) < 2
             :close
           else
-            ["127.0.0.1", "6382"]
+            ["127.0.0.1", port.to_s]
           end
         end
       }
@@ -210,9 +222,11 @@ def test_sentinel_retries
       end
     }
 
-    RedisMock.start(master, {}, 6382) do
-      RedisMock.start(handler.call(:s1), {}, 26381) do
-        RedisMock.start(handler.call(:s2), {}, 26382) do
+    RedisMock.start(master, {}, 0) do |master_port|
+      RedisMock.start(handler.call(:s1, master_port), {}, 0) do |s1_port|
+        RedisMock.start(handler.call(:s2, master_port), {}, 0) do |s2_port|
+          sentinels[0][:port] = s1_port
+          sentinels[1][:port] = s2_port
           redis = Redis.new(:url => "redis://master1", :sentinels => sentinels, :role => :master, :reconnect_attempts => 1)
 
           assert redis.ping
@@ -225,9 +239,9 @@ def test_sentinel_retries
     connections.clear
 
     ex = assert_raise(Redis::CannotConnectError) do
-      RedisMock.start(master, {}, 6382) do
-        RedisMock.start(handler.call(:s1), {}, 26381) do
-          RedisMock.start(handler.call(:s2), {}, 26382) do
+      RedisMock.start(master, {}, 0) do |master_port|
+        RedisMock.start(handler.call(:s1, master_port), {}, 0) do |s1_port|
+          RedisMock.start(handler.call(:s2, master_port), {}, 0) do |s2_port|
             redis = Redis.new(:url => "redis://master1", :sentinels => sentinels, :role => :master, :reconnect_attempts => 0)
 
             assert redis.ping

test/support/redis_mock.rb

@@ -9,6 +9,10 @@ def initialize(port, options = {}, &block)
       @server.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
     end
 
+    def port
+      @server.addr[1]
+    end
+
     def start(&block)
       @thread = Thread.new { run(&block) }
     end
@@ -61,6 +65,7 @@ def run
   #
   def self.start_with_handler(blk, options = {}, port = MOCK_PORT)
     server = Server.new(port, options)
+    port = server.port
 
     begin
       server.start(&blk)