Fix sentinel when using a database other than 0.

Author: djanowski

lib/redis/client.rb

@@ -488,8 +488,10 @@ class Sentinel < Connector
         def initialize(options)
           super(options)
 
+          @options[:password] = DEFAULTS.fetch(:password)
+          @options[:db] = DEFAULTS.fetch(:db)
+
           @sentinels = @options.delete(:sentinels).dup
-          @options.delete(:password)
           @role = @options.fetch(:role, "master").to_s
           @master = @options[:host]
         end

test/sentinel_test.rb

@@ -110,7 +110,7 @@ def test_sentinel_failover_prioritize_healthy_sentinel
     assert_equal commands[:s2], [%w[get-master-addr-by-name master1], %w[get-master-addr-by-name master1]]
   end
 
-  def test_sentinel_with_auth
+  def test_sentinel_with_non_sentinel_options
     sentinels = [{:host => "127.0.0.1", :port => 26381}]
 
     commands = {
@@ -123,6 +123,10 @@ def test_sentinel_with_auth
         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"]
@@ -142,7 +146,7 @@ def test_sentinel_with_auth
 
     RedisMock.start(master, {}, 6382) do
       RedisMock.start(sentinel, {}, 26381) do
-        redis = Redis.new(:url => "redis://:foo@master1", :sentinels => sentinels, :role => :master)
+        redis = Redis.new(:url => "redis://:foo@master1/15", :sentinels => sentinels, :role => :master)
 
         assert redis.ping
       end