redis 4.0.1 → 4.1.0

data/test/publish_subscribe_test.rb

@@ -1,280 +0,0 @@
-require_relative "helper"
-
-class TestPublishSubscribe < Test::Unit::TestCase
-
-  include Helper::Client
-
-  class TestError < StandardError
-  end
-
-  def test_subscribe_and_unsubscribe
-    @subscribed = false
-    @unsubscribed = false
-
-    wire = Wire.new do
-      r.subscribe("foo") do |on|
-        on.subscribe do |channel, total|
-          @subscribed = true
-          @t1 = total
-        end
-
-        on.message do |channel, message|
-          if message == "s1"
-            r.unsubscribe
-            @message = message
-          end
-        end
-
-        on.unsubscribe do |channel, total|
-          @unsubscribed = true
-          @t2 = total
-        end
-      end
-    end
-
-    # Wait until the subscription is active before publishing
-    Wire.pass while !@subscribed
-
-    Redis.new(OPTIONS).publish("foo", "s1")
-
-    wire.join
-
-    assert @subscribed
-    assert_equal 1, @t1
-    assert @unsubscribed
-    assert_equal 0, @t2
-    assert_equal "s1", @message
-  end
-
-  def test_psubscribe_and_punsubscribe
-    @subscribed = false
-    @unsubscribed = false
-
-    wire = Wire.new do
-      r.psubscribe("f*") do |on|
-        on.psubscribe do |pattern, total|
-          @subscribed = true
-          @t1 = total
-        end
-
-        on.pmessage do |pattern, channel, message|
-          if message == "s1"
-            r.punsubscribe
-            @message = message
-          end
-        end
-
-        on.punsubscribe do |pattern, total|
-          @unsubscribed = true
-          @t2 = total
-        end
-      end
-    end
-
-    # Wait until the subscription is active before publishing
-    Wire.pass while !@subscribed
-
-    Redis.new(OPTIONS).publish("foo", "s1")
-
-    wire.join
-
-    assert @subscribed
-    assert_equal 1, @t1
-    assert @unsubscribed
-    assert_equal 0, @t2
-    assert_equal "s1", @message
-  end
-
-  def test_pubsub_with_numpat_subcommand
-    target_version("2.8.0") do
-      @subscribed = false
-      wire = Wire.new do
-        r.psubscribe("f*") do |on|
-          on.psubscribe { |channel, total| @subscribed = true }
-          on.pmessage   { |pattern, channel, message| r.punsubscribe }
-        end
-      end
-      Wire.pass while !@subscribed
-      redis = Redis.new(OPTIONS)
-      numpat_result = redis.pubsub(:numpat)
-
-      redis.publish("foo", "s1")
-      wire.join
-
-      assert_equal redis.pubsub(:numpat), 0
-      assert_equal numpat_result, 1
-    end
-  end
-
-
-  def test_pubsub_with_channels_and_numsub_subcommnads
-    target_version("2.8.0") do
-      @subscribed = false
-      wire = Wire.new do
-        r.subscribe("foo") do |on|
-          on.subscribe { |channel, total| @subscribed = true }
-          on.message   { |channel, message| r.unsubscribe }
-        end
-      end
-      Wire.pass while !@subscribed
-      redis = Redis.new(OPTIONS)
-      channels_result = redis.pubsub(:channels)
-      numsub_result   = redis.pubsub(:numsub, 'foo', 'boo')
-
-      redis.publish("foo", "s1")
-      wire.join
-
-      assert_equal channels_result, ['foo']
-      assert_equal numsub_result, ['foo', 1, 'boo', 0]
-    end
-  end
-
-  def test_subscribe_connection_usable_after_raise
-    @subscribed = false
-
-    wire = Wire.new do
-      begin
-        r.subscribe("foo") do |on|
-          on.subscribe do |channel, total|
-            @subscribed = true
-          end
-
-          on.message do |channel, message|
-            raise TestError
-          end
-        end
-      rescue TestError
-      end
-    end
-
-    # Wait until the subscription is active before publishing
-    Wire.pass while !@subscribed
-
-    Redis.new(OPTIONS).publish("foo", "s1")
-
-    wire.join
-
-    assert_equal "PONG", r.ping
-  end
-
-  def test_psubscribe_connection_usable_after_raise
-    @subscribed = false
-
-    wire = Wire.new do
-      begin
-        r.psubscribe("f*") do |on|
-          on.psubscribe do |pattern, total|
-            @subscribed = true
-          end
-
-          on.pmessage do |pattern, channel, message|
-            raise TestError
-          end
-        end
-      rescue TestError
-      end
-    end
-
-    # Wait until the subscription is active before publishing
-    Wire.pass while !@subscribed
-
-    Redis.new(OPTIONS).publish("foo", "s1")
-
-    wire.join
-
-    assert_equal "PONG", r.ping
-  end
-
-  def test_subscribe_within_subscribe
-    @channels = []
-
-    wire = Wire.new do
-      r.subscribe("foo") do |on|
-        on.subscribe do |channel, total|
-          @channels << channel
-
-          r.subscribe("bar") if channel == "foo"
-          r.unsubscribe if channel == "bar"
-        end
-      end
-    end
-
-    wire.join
-
-    assert_equal ["foo", "bar"], @channels
-  end
-
-  def test_other_commands_within_a_subscribe
-    assert_raise Redis::CommandError do
-      r.subscribe("foo") do |on|
-        on.subscribe do |channel, total|
-          r.set("bar", "s2")
-        end
-      end
-    end
-  end
-
-  def test_subscribe_without_a_block
-    assert_raise LocalJumpError do
-      r.subscribe("foo")
-    end
-  end
-
-  def test_unsubscribe_without_a_subscribe
-    assert_raise RuntimeError do
-      r.unsubscribe
-    end
-
-    assert_raise RuntimeError do
-      r.punsubscribe
-    end
-  end
-
-  def test_subscribe_past_a_timeout
-    # For some reason, a thread here doesn't reproduce the issue.
-    sleep = %{sleep #{OPTIONS[:timeout] * 2}}
-    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|
-      received = false
-
-      r.subscribe "foo" do |on|
-        on.message do |channel, message|
-          received = true
-          r.unsubscribe
-        end
-      end
-
-      assert received
-    end
-  end
-
-  def test_subscribe_with_timeout
-    received = false
-
-    assert_raise Redis::TimeoutError do
-      r.subscribe_with_timeout(1, "foo")  do |on|
-        on.message do |channel, message|
-          received = true
-        end
-      end
-    end
-
-    assert !received
-  end
-
-  def test_psubscribe_with_timeout
-    received = false
-
-    assert_raise Redis::TimeoutError do
-      r.psubscribe_with_timeout(1, "f*")  do |on|
-        on.message do |channel, message|
-          received = true
-        end
-      end
-    end
-
-    assert !received
-  end
-end

data/test/remote_server_control_commands_test.rb

@@ -1,175 +0,0 @@
-require_relative "helper"
-
-class TestRemoteServerControlCommands < Test::Unit::TestCase
-
-  include Helper::Client
-
-  def test_info
-    keys = [
-     "redis_version",
-     "uptime_in_seconds",
-     "uptime_in_days",
-     "connected_clients",
-     "used_memory",
-     "total_connections_received",
-     "total_commands_processed",
-    ]
-
-    info = r.info
-
-    keys.each do |k|
-      msg = "expected #info to include #{k}"
-      assert info.keys.include?(k), msg
-    end
-  end
-
-  def test_info_commandstats
-    target_version "2.5.7" do
-      r.config(:resetstat)
-      r.ping
-
-      result = r.info(:commandstats)
-      assert_equal "1", result["ping"]["calls"]
-    end
-  end
-
-  def test_monitor_redis_lt_2_5_0
-    return unless version < "2.5.0"
-
-    log = []
-
-    wire = Wire.new do
-      Redis.new(OPTIONS).monitor do |line|
-        log << line
-        break if log.size == 3
-      end
-    end
-
-    Wire.pass while log.empty? # Faster than sleep
-
-    r.set "foo", "s1"
-
-    wire.join
-
-    assert log[-1][%q{(db 15) "set" "foo" "s1"}]
-  end
-
-  def test_monitor_redis_gte_2_5_0
-    return unless version >= "2.5.0"
-
-    log = []
-
-    wire = Wire.new do
-      Redis.new(OPTIONS).monitor do |line|
-        log << line
-        break if line =~ /set/
-      end
-    end
-
-    Wire.pass while log.empty? # Faster than sleep
-
-    r.set "foo", "s1"
-
-    wire.join
-
-    assert log[-1] =~ /\b15\b.* "set" "foo" "s1"/
-  end
-
-  def test_monitor_returns_value_for_break
-    result = r.monitor do |line|
-      break line
-    end
-
-    assert_equal "OK", result
-  end
-
-  def test_echo
-    assert_equal "foo bar baz\n", r.echo("foo bar baz\n")
-  end
-
-  def test_debug
-    r.set "foo", "s1"
-
-    assert r.debug(:object, "foo").kind_of?(String)
-  end
-
-  def test_object
-    r.lpush "list", "value"
-
-    assert_equal 1, r.object(:refcount, "list")
-    encoding = r.object(:encoding, "list")
-    assert "ziplist" == encoding || "quicklist" == encoding, "Wrong encoding for list"
-    assert r.object(:idletime, "list").kind_of?(Integer)
-  end
-
-  def test_sync
-    redis_mock(:sync => lambda { "+OK" }) do |redis|
-      assert_equal "OK", redis.sync
-    end
-  end
-
-  def test_slowlog
-    r.slowlog(:reset)
-    result = r.slowlog(:len)
-    assert_equal 0, result
-  end
-
-  def test_client
-    assert_equal r.instance_variable_get(:@client), r._client
-  end
-
-  def test_client_list
-    return if version < "2.4.0"
-
-    keys = [
-     "addr",
-     "fd",
-     "name",
-     "age",
-     "idle",
-     "flags",
-     "db",
-     "sub",
-     "psub",
-     "multi",
-     "qbuf",
-     "qbuf-free",
-     "obl",
-     "oll",
-     "omem",
-     "events",
-     "cmd"
-    ]
-
-    clients = r.client(:list)
-    clients.each do |client|
-      keys.each do |k|
-        msg = "expected #client(:list) to include #{k}"
-        assert client.keys.include?(k), msg
-      end
-    end
-  end
-
-  def test_client_kill
-    return if version < "2.6.9"
-
-    r.client(:setname, 'redis-rb')
-    clients = r.client(:list)
-    i = clients.index {|client| client['name'] == 'redis-rb'}
-    assert_equal "OK", r.client(:kill, clients[i]["addr"])
-
-    clients = r.client(:list)
-    i = clients.index {|client| client['name'] == 'redis-rb'}
-    assert_equal nil, i
-  end
-
-  def test_client_getname_and_setname
-    return if version < "2.6.9"
-
-    assert_equal nil, r.client(:getname)
-
-    r.client(:setname, 'redis-rb')
-    name = r.client(:getname)
-    assert_equal 'redis-rb', name
-  end
-end