Add tests for connecting to IPv4 and IPv6

Author: pietern

test/helper.rb

@@ -148,13 +148,13 @@ def teardown
     end
 
     def redis_mock(commands, options = {}, &blk)
-      RedisMock.start(commands) do |port|
+      RedisMock.start(commands, options) do |port|
         yield _new_client(options.merge(:port => port))
       end
     end
 
     def redis_mock_with_handler(handler, options = {}, &blk)
-      RedisMock.start_with_handler(handler) do |port|
+      RedisMock.start_with_handler(handler, options) do |port|
         yield _new_client(options.merge(:port => port))
       end
     end

test/internals_test.rb

@@ -348,4 +348,50 @@ def test_resolves_localhost
       Redis.new(OPTIONS.merge(:host => 'localhost')).ping
     end
   end
+
+  class << self
+    def af_family_supported(af)
+      hosts = {
+        Socket::AF_INET  => "127.0.0.1",
+        Socket::AF_INET6 => "::1",
+      }
+
+      begin
+        s = Socket.new(af, Socket::SOCK_STREAM, 0)
+        begin
+          sa = Socket.pack_sockaddr_in(9999, hosts[af])
+          s.bind(sa)
+          yield
+        rescue Errno::EADDRNOTAVAIL
+        ensure
+          s.close
+        end
+      rescue Errno::ESOCKTNOSUPPORT
+      end
+    end
+  end
+
+  def af_test(host)
+    commands = {
+      :ping => lambda { |*_| "+pong" },
+    }
+
+    redis_mock(commands, :host => host) do |redis|
+      assert_nothing_raised do
+        redis.ping
+      end
+    end
+  end
+
+  af_family_supported(Socket::AF_INET) do
+    def test_connect_ipv4
+      af_test("127.0.0.1")
+    end
+  end
+
+  af_family_supported(Socket::AF_INET6) do
+    def test_connect_ipv6
+      af_test("::1")
+    end
+  end
 end

test/support/redis_mock.rb

@@ -4,8 +4,8 @@ module RedisMock
   class Server
     VERBOSE = false
 
-    def initialize(port, &block)
-      @server = TCPServer.new("127.0.0.1", port)
+    def initialize(port, options = {}, &block)
+      @server = TCPServer.new(options[:host] || "127.0.0.1", port)
       @server.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
     end
 
@@ -53,8 +53,8 @@ def run
   #     # Every connection will be closed immediately
   #   end
   #
-  def self.start_with_handler(blk)
-    server = Server.new(MOCK_PORT)
+  def self.start_with_handler(blk, options = {})
+    server = Server.new(MOCK_PORT, options)
 
     begin
       server.start(&blk)
@@ -75,7 +75,7 @@ def self.start_with_handler(blk)
   #     assert_equal "PONG", Redis.new(:port => MOCK_PORT).ping
   #   end
   #
-  def self.start(commands = {}, &blk)
+  def self.start(commands, options = {}, &blk)
     handler = lambda do |session|
       while line = session.gets
         argv = Array.new(line[1..-3].to_i) do
@@ -110,6 +110,6 @@ def self.start(commands = {}, &blk)
       end
     end
 
-    start_with_handler(handler, &blk)
+    start_with_handler(handler, options, &blk)
   end
 end