redis 3.3.5 → 4.3.1

data/test/support/ssl/untrusted-ca.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEArV8XBBlKxqgKpQSveAfCMEpAfDpy2Av3P+k3XlhuOqc5mVmb
-334tGpHCirm0TXH6Grzrqi7jZ6UA5CJZyd+yvy2ZPEOfmjKFBgYkNo0jde9O7Bah
-93kxb1zlM5QxHLAWu2O0bmiPEl4NVBrJ5wnI+h9wVtsSnFzzev7N9L4TcNgj6rV5
-uDTg92W+RZAfXqQBHo0YNDj5+Qyd5hElafx9hKpKbTGfunDpNvwjHHvAAH3MQRsC
-rjjFzTg7M0zcTfjrhghzscfPr0f3ld+baJyEsG5JjvViOgwvqVk9rD7w4bkLarK1
-aHwj/6Yq3m+Qnv+2z/xbGXDUjDH1eXaaJ3GK6wIDAQABAoIBAQCeC0QxAVlwNTnW
-6qmGsxPr75RPavzMREQ1p8VIpTZ/E3hneg+lMiGtydhdnCJoQxGrFDOFJU86aWmh
-jkrpw5nvu4KoNEEnUQyAzFJwxELiPLBmec9WiM1u5nEujtYif8eJNcACsiBSrxhZ
-Zj5N9laW5NgE5ZpWnkl7AxL/G9MfFvifr9KtyDcs+wnYD6ffz/bRwS54veMccj/q
-SkVQRL7FM4NJczG0TTp+LT/1R3s8YVv9GHnJ6K7Gol3E0PbFS1HztDuMVonhWiac
-9Rjt7w0rNgeH6ZbCMXrUd+8I8amazA78p1ky0Mh8d6UUVFU1jjtyxlgDh06IPsnE
-+exeAClxAoGBAOMZ7LEFr3VcFwym7RvgckeQhd6Rmz8Bh7kGfB9pDsHFprGJ0rm4
-XgNETJXOky5wUCPZmMBN1iAU/ehyyXqPykXiKjAQLxQNHR9/Z6P58PsHs2Uw8VZa
-XdZwlBME5+/yl5DiirO5rCt804DdCQgSu7denudwWbbtzAsodSKj5zEJAoGBAMNu
-21hZnsvhtZlvQVHZ4sQttrv9e5VpWWHkDPRN3sdLZPfK/+3L0BmUrGotgNWpTZwR
-8YvKRT2Xn1unzpKlkHtIVuHU7khOj+tYHLIx3rezVanw9QzbIANMel6STlUr3jwX
-fjnibgkJixxHTOBs8/zm219Q1sNTos9GUOAZQb1TAoGALwGFsVpo59TI3JCMkXGS
-led/HgNra84oRo7mECZRrJ/5kdPiLxjPNMPlSji41CrhG5qFeIBj6r4NlBh2RY0P
-pAldDBe9dtwEBCn9zL4GOB9u7WoE+ge4VpN0wr8INu0ynAWYCf1LerDaolid7vLZ
-sem+4E6r8yYjTsfv/tyIFOkCgYEAlCZobxxZLbNn5+2X9cWXiyIgYXgyBDy9fmDT
-lSum0yuLWfDwfELB+XJkFYVzIgVbCRHtKwxl2uAi9OdLyI1r7pkTC9VP4U50+XJt
-JoR5koaHTPGVwm4mYXnLVf/RE+3SZXllvdmxknZCl2hRldviRfh3mlT8yUuQo1Jp
-oshitnMCgYAXTQLA7B5YLmhCG8HRM/h/xM55ObdDX1SIWUbk3p1uxak1W0abfvpi
-FPBy2riOdSDA6Uv7V8y1j4tENGVMyyMsEpFdLDX4Lkbh9niOoPeHCWdO0boPk0Fw
-aPXtT7gdTPWJulKOxtLuGqBjZZ77TO49uqWlEMaerulWyjhRm8zzvA==
------END RSA PRIVATE KEY-----

data/test/support/ssl/untrusted-cert.crt

@@ -1,82 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 9801410922913464933 (0x88059b4de5e40265)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=XX, ST=Untrusted, L=Evilville, O=Evil Hacker, OU=Attack Department, CN=127.0.0.1
-        Validity
-            Not Before: Apr  2 03:34:51 2016 GMT
-            Not After : Jun 23 03:34:51 2050 GMT
-        Subject: C=XX, ST=Untrusted, O=Evil Hacker, OU=Attack Department, CN=127.0.0.1
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:9a:73:e7:45:fc:d3:b5:4a:bd:bd:ad:30:e5:24:
-                    74:38:01:89:8f:a9:90:bf:3c:4a:bf:d1:f1:5e:db:
-                    c8:aa:26:59:e6:ec:b3:a0:0f:4d:74:59:dd:c9:27:
-                    2f:e1:48:7d:30:d9:59:06:2f:29:f0:d1:25:33:79:
-                    5f:58:9d:d7:54:c8:a7:aa:1a:84:00:a2:85:63:32:
-                    cc:ef:73:7d:b0:26:c6:95:f1:86:16:68:38:63:57:
-                    09:0d:6f:6a:70:e8:75:3b:72:b4:b1:4d:01:0e:01:
-                    0e:bf:bf:6a:8c:88:fe:0d:cb:88:43:1b:da:ed:0c:
-                    88:25:33:f7:b9:b1:fc:32:b8:94:c9:20:7c:ac:49:
-                    e4:c1:58:93:69:0e:41:e3:df:96:e3:47:11:14:8c:
-                    e4:4b:b6:56:df:6f:5e:d2:48:dc:a1:8a:98:cc:4b:
-                    02:89:95:ea:f6:de:a5:3a:9c:06:7c:f0:7c:09:6f:
-                    27:11:f2:b1:1b:47:6b:a3:ea:d6:ee:a1:65:91:84:
-                    cf:2e:81:d3:55:4a:e8:01:4e:72:41:ac:92:e0:7d:
-                    7c:fe:85:f0:2e:f1:ee:4a:80:f9:4e:5a:b4:95:6c:
-                    bb:fe:ff:46:58:4a:7b:fc:a0:63:59:5d:01:5b:63:
-                    06:5c:94:83:30:27:81:f0:1a:13:89:5a:5a:a2:e2:
-                    0f:eb
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                1B:71:91:99:43:12:0F:D3:59:FC:00:EF:99:F3:42:CF:41:FD:40:1D
-            X509v3 Authority Key Identifier: 
-                keyid:B7:83:36:F2:A9:24:A9:AE:C8:FB:1A:99:AC:76:01:94:E2:8D:D9:30
-
-    Signature Algorithm: sha1WithRSAEncryption
-         a4:cd:88:c3:19:b7:cd:7e:7a:e7:85:1f:fb:3e:31:0b:ff:9d:
-         6f:b1:a2:72:56:4a:b1:ec:6c:f3:99:bd:65:08:0a:e9:47:1d:
-         79:55:5b:29:b1:d4:85:69:85:65:3f:30:37:a1:0e:76:d2:1f:
-         b0:76:2a:23:75:c9:05:a4:89:cf:c1:68:42:16:46:d6:c9:a8:
-         e5:06:5b:52:45:d4:41:5d:f3:c7:00:d1:ca:cc:3e:4c:63:e6:
-         7a:fe:ce:20:a4:df:e3:7c:e3:75:6e:f7:18:84:1c:9b:56:ce:
-         55:fb:04:b9:de:11:6e:7d:5d:47:de:a9:ed:3e:79:48:a5:4f:
-         32:d5:96:8d:ea:e2:a6:8a:c2:e9:f5:b0:8d:da:ef:71:96:60:
-         b0:7e:c3:3d:e9:37:91:27:bf:ae:5c:e8:c0:9a:6f:c8:38:62:
-         90:d0:49:c1:7f:28:13:da:29:bb:5b:d1:72:6f:23:7c:a0:87:
-         44:96:47:53:0e:0d:1d:74:d9:26:6b:b3:01:24:9c:5e:c8:f4:
-         11:fe:35:14:6c:ec:e7:42:5f:32:56:f0:9d:8d:11:02:21:07:
-         cc:ce:7b:f0:e9:bc:83:c8:93:b0:8c:a7:e9:b1:c2:12:6b:30:
-         2b:75:dc:61:b8:d4:87:6b:07:2d:75:b0:7a:18:6e:19:7f:04:
-         78:c6:c7:b7
------BEGIN CERTIFICATE-----
-MIID4jCCAsqgAwIBAgIJAIgFm03l5AJlMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-BAYTAlhYMRIwEAYDVQQIEwlVbnRydXN0ZWQxEjAQBgNVBAcTCUV2aWx2aWxsZTEU
-MBIGA1UEChMLRXZpbCBIYWNrZXIxGjAYBgNVBAsTEUF0dGFjayBEZXBhcnRtZW50
-MRIwEAYDVQQDEwkxMjcuMC4wLjEwIBcNMTYwNDAyMDMzNDUxWhgPMjA1MDA2MjMw
-MzM0NTFaMGcxCzAJBgNVBAYTAlhYMRIwEAYDVQQIEwlVbnRydXN0ZWQxFDASBgNV
-BAoTC0V2aWwgSGFja2VyMRowGAYDVQQLExFBdHRhY2sgRGVwYXJ0bWVudDESMBAG
-A1UEAxMJMTI3LjAuMC4xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-mnPnRfzTtUq9va0w5SR0OAGJj6mQvzxKv9HxXtvIqiZZ5uyzoA9NdFndyScv4Uh9
-MNlZBi8p8NElM3lfWJ3XVMinqhqEAKKFYzLM73N9sCbGlfGGFmg4Y1cJDW9qcOh1
-O3K0sU0BDgEOv79qjIj+DcuIQxva7QyIJTP3ubH8MriUySB8rEnkwViTaQ5B49+W
-40cRFIzkS7ZW329e0kjcoYqYzEsCiZXq9t6lOpwGfPB8CW8nEfKxG0dro+rW7qFl
-kYTPLoHTVUroAU5yQayS4H18/oXwLvHuSoD5Tlq0lWy7/v9GWEp7/KBjWV0BW2MG
-XJSDMCeB8BoTiVpaouIP6wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUG3GR
-mUMSD9NZ/ADvmfNCz0H9QB0wHwYDVR0jBBgwFoAUt4M28qkkqa7I+xqZrHYBlOKN
-2TAwDQYJKoZIhvcNAQEFBQADggEBAKTNiMMZt81+eueFH/s+MQv/nW+xonJWSrHs
-bPOZvWUICulHHXlVWymx1IVphWU/MDehDnbSH7B2KiN1yQWkic/BaEIWRtbJqOUG
-W1JF1EFd88cA0crMPkxj5nr+ziCk3+N843Vu9xiEHJtWzlX7BLneEW59XUfeqe0+
-eUilTzLVlo3q4qaKwun1sI3a73GWYLB+wz3pN5Env65c6MCab8g4YpDQScF/KBPa
-Kbtb0XJvI3ygh0SWR1MODR102SZrswEknF7I9BH+NRRs7OdCXzJW8J2NEQIhB8zO
-e/DpvIPIk7CMp+mxwhJrMCt13GG41IdrBy11sHoYbhl/BHjGx7c=
------END CERTIFICATE-----

data/test/support/ssl/untrusted-cert.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCac+dF/NO1Sr29
-rTDlJHQ4AYmPqZC/PEq/0fFe28iqJlnm7LOgD010Wd3JJy/hSH0w2VkGLynw0SUz
-eV9YnddUyKeqGoQAooVjMszvc32wJsaV8YYWaDhjVwkNb2pw6HU7crSxTQEOAQ6/
-v2qMiP4Ny4hDG9rtDIglM/e5sfwyuJTJIHysSeTBWJNpDkHj35bjRxEUjORLtlbf
-b17SSNyhipjMSwKJler23qU6nAZ88HwJbycR8rEbR2uj6tbuoWWRhM8ugdNVSugB
-TnJBrJLgfXz+hfAu8e5KgPlOWrSVbLv+/0ZYSnv8oGNZXQFbYwZclIMwJ4HwGhOJ
-Wlqi4g/rAgMBAAECggEAPX3fmfGqqAb1u8p0KQZ2bsXN6rBrvHdYmz4OhuGh5nwW
-VuXuLc9p2uTcc/VyDpM5pHUkCF5GqGXcFb5Aw5sz28F3XzXnUAlkabYT+VFVvQfz
-EEd0Rv9/U62XIQ42pnUmF2D3p48s2FJ7eMPQu9reqsdZnL4+TxoqKgWinv/JlLdh
-zBxjgVgaDMsvVc4cuuT6bcI3DUe2F9ALBKfaCxZoOUSsmgieuXog00Bzv0NmZoUD
-WsAX0syzUlwjVmCr8J4I0IByYAbn1S/ozU141Z+H+VUyuEpYw0zDqDNrlmdYclc8
-neoq8Xj9Cx1zHdF5H3aT9SLUGxdHPJpED9wQNx2toQKBgQDJcgJEG39u3h3mW/At
-f8jl8evar5nUOOn5AIxVGFAWx4ZvoboxHSRlS6UkF0AImlH4L7xQESb9BMzOrObN
-PBNQrccH+fz1o1fHDhob7EvyMMwzmDCPpQnN/6KXRzapu2MDFvlMkEMITTN7J0En
-c9BOxo06Q4DKXGVCiWmbIwXihQKBgQDER/KfaWRZWOA2mQ26giJVjUX4+s1GeQM0
-V4AIo1KS6fDzh68RsAQpMTx/N8aHEcxf+2qGIOTCvFY3Nxqe5aw/Xiz47MPlYulM
-OecovSO96nidhyv2Zux+HpvI85tcWTyORi+RWho51gTOLth6BJ4uvSsaooWmO0Va
-GoIxKcaLrwKBgH/guuWHWy8DG5H3fRE1FFA8cc+iN5HMC2NBYNRIGddME+BblznE
-WS1ghtXRWJnddPmLPAzLxqdJ28W7ZsyUPWKy3i0HGfjJF1jKb/KX32JAbfC2xOT7
-DK1TgWBtGZtH1EPK2rkqvxLPB0Y/lhG4aF0Jl++LmH9dhf5mAr8zzXGNAoGBAKEi
-l7H66aDX76mi2LxmnR0yz2DpNKBINDNCKh/tRJrLZz3mA/k3URMoEow2E8tK90dM
-tVTLqEGeMAFAQaB02IVlIPJyHRgxrWkgl/6/15nP5ZkdISA1uqyHIElGhCK6N5Zt
-VBu1ppYYdvV1S85QADRKpBpHlgSz3+lqnbsSmqaNAoGAacA3XSIzTHj6+06VzEHN
-aO2LJbBxl6Eduj6eTEgcZBlQOX6cVvaleTAT2g2xM0aGMV4StmdijUdktjBQVLpH
-8PBTqlfVuLXEXQd+qWMpUJwEkh/pdmf9EPoLSfp3zQLaNI/kCg3jQtR4n6/68hfi
-5Q6L0mN+SoB+jRNPDSV7JWA=
------END PRIVATE KEY-----

data/test/support/wire/synchrony.rb

@@ -1,24 +0,0 @@
-class Wire < Fiber
-  # We cannot run this fiber explicitly because EM schedules it. Resuming the
-  # current fiber on the next tick to let the reactor do work.
-  def self.pass
-    f = Fiber.current
-    EM.next_tick { f.resume }
-    Fiber.yield
-  end
-
-  def self.sleep(sec)
-    EM::Synchrony.sleep(sec)
-  end
-
-  def initialize(&blk)
-    super
-
-    # Schedule run in next tick
-    EM.next_tick { resume }
-  end
-
-  def join
-    self.class.pass while alive?
-  end
-end

data/test/support/wire/thread.rb

@@ -1,5 +0,0 @@
-class Wire < Thread
-  def self.sleep(sec)
-    Kernel.sleep(sec)
-  end
-end

data/test/synchrony_driver.rb

@@ -1,88 +0,0 @@
-# encoding: UTF-8
-
-require 'em-synchrony'
-require 'em-synchrony/connection_pool'
-
-require 'redis'
-require 'redis/connection/synchrony'
-
-
-require File.expand_path("./helper", File.dirname(__FILE__))
-
-PORT    = 6381
-OPTIONS = {:port => PORT, :db => 15}
-
-#
-# if running under Eventmachine + Synchrony (Ruby 1.9+), then
-# we can simulate the blocking API while performing the network
-# IO via the EM reactor.
-#
-
-EM.synchrony do
-  r = Redis.new OPTIONS
-  r.flushdb
-
-  r.rpush "foo", "s1"
-  r.rpush "foo", "s2"
-
-  assert_equal 2, r.llen("foo")
-  assert_equal "s2", r.rpop("foo")
-
-  r.set("foo", "bar")
-
-  assert_equal "bar", r.getset("foo", "baz")
-  assert_equal "baz", r.get("foo")
-
-  r.set("foo", "a")
-
-  assert_equal 1, r.getbit("foo", 1)
-  assert_equal 1, r.getbit("foo", 2)
-  assert_equal 0, r.getbit("foo", 3)
-  assert_equal 0, r.getbit("foo", 4)
-  assert_equal 0, r.getbit("foo", 5)
-  assert_equal 0, r.getbit("foo", 6)
-  assert_equal 1, r.getbit("foo", 7)
-
-  r.flushdb
-
-  # command pipelining
-  r.pipelined do
-    r.lpush "foo", "s1"
-    r.lpush "foo", "s2"
-  end
-
-  assert_equal 2, r.llen("foo")
-  assert_equal "s2", r.lpop("foo")
-  assert_equal "s1", r.lpop("foo")
-
-  assert_equal "OK", r.client.call(:quit)
-  assert_equal "PONG", r.ping
-
-
-  rpool = EM::Synchrony::ConnectionPool.new(size: 5) { Redis.new OPTIONS }
-
-  result = rpool.watch 'foo' do |rd|
-    assert_kind_of Redis, rd
-
-    rd.set "foo", "s1"
-    rd.multi do |multi|
-      multi.set "foo", "s2"
-    end
-  end
-
-  assert_equal nil, result
-  assert_equal "s1", rpool.get("foo")
-
-  result = rpool.watch "foo" do |rd|
-    assert_kind_of Redis, rd
-
-    rd.multi do |multi|
-      multi.set "foo", "s3"
-    end
-  end
-
-  assert_equal ["OK"], result
-  assert_equal "s3", rpool.get("foo")
-
-  EM.stop
-end

data/test/test.conf.erb

@@ -1,9 +0,0 @@
-dir <%=        REDIS_DIR %>
-pidfile <%=    REDIS_PID %>
-port 6381
-unixsocket <%= REDIS_SOCKET %>
-timeout 300
-loglevel debug
-logfile <%=    REDIS_LOG %>
-databases 16
-daemonize yes

data/test/thread_safety_test.rb

@@ -1,62 +0,0 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-
-class TestThreadSafety < Test::Unit::TestCase
-
-  include Helper::Client
-
-  driver(:ruby, :hiredis) do
-    def test_thread_safety
-      redis = Redis.new(OPTIONS)
-      redis.set "foo", 1
-      redis.set "bar", 2
-
-      sample = 100
-
-      t1 = Thread.new do
-        $foos = Array.new(sample) { redis.get "foo" }
-      end
-
-      t2 = Thread.new do
-        $bars = Array.new(sample) { redis.get "bar" }
-      end
-
-      t1.join
-      t2.join
-
-      assert_equal ["1"], $foos.uniq
-      assert_equal ["2"], $bars.uniq
-    end
-
-    def test_thread_safety_queue_commit
-      redis = Redis.new(OPTIONS)
-      redis.set "foo", 1
-      redis.set "bar", 2
-
-      sample = 100
-
-      t1 = Thread.new do
-        sample.times do
-          r.queue("get", "foo")
-        end
-
-        $foos = r.commit
-      end
-
-      t2 = Thread.new do
-        sample.times do
-          r.queue("get", "bar")
-        end
-
-        $bars = r.commit
-      end
-
-      t1.join
-      t2.join
-
-      assert_equal ["1"], $foos.uniq
-      assert_equal ["2"], $bars.uniq
-    end
-  end
-end

data/test/transactions_test.rb

@@ -1,264 +0,0 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-
-class TestTransactions < Test::Unit::TestCase
-
-  include Helper::Client
-
-  def test_multi_discard
-    r.multi
-
-    assert_equal "QUEUED", r.set("foo", "1")
-    assert_equal "QUEUED", r.get("foo")
-
-    r.discard
-
-    assert_equal nil, r.get("foo")
-  end
-
-  def test_multi_exec_with_a_block
-    r.multi do |multi|
-      multi.set "foo", "s1"
-    end
-
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_multi_exec_with_a_block_doesn_t_return_replies_for_multi_and_exec
-    r1, r2, nothing_else = r.multi do |multi|
-      multi.set "foo", "s1"
-      multi.get "foo"
-    end
-
-    assert_equal "OK", r1
-    assert_equal "s1", r2
-    assert_equal nil, nothing_else
-  end
-
-  def test_assignment_inside_multi_exec_block
-    r.multi do |m|
-      @first = m.sadd("foo", 1)
-      @second = m.sadd("foo", 1)
-    end
-
-    assert_equal true, @first.value
-    assert_equal false, @second.value
-  end
-
-  # Although we could support accessing the values in these futures,
-  # it doesn't make a lot of sense.
-  def test_assignment_inside_multi_exec_block_with_delayed_command_errors
-    assert_raise(Redis::CommandError) do
-      r.multi do |m|
-        @first = m.set("foo", "s1")
-        @second = m.incr("foo") # not an integer
-        @third = m.lpush("foo", "value") # wrong kind of value
-      end
-    end
-
-    assert_equal "OK", @first.value
-    assert_raise(Redis::CommandError) { @second.value }
-    assert_raise(Redis::FutureNotReady) { @third.value }
-  end
-
-  def test_assignment_inside_multi_exec_block_with_immediate_command_errors
-    assert_raise(Redis::CommandError) do
-      r.multi do |m|
-        m.doesnt_exist
-        @first = m.sadd("foo", 1)
-        @second = m.sadd("foo", 1)
-      end
-    end
-
-    assert_raise(Redis::FutureNotReady) { @first.value }
-    assert_raise(Redis::FutureNotReady) { @second.value }
-  end
-
-  def test_raise_immediate_errors_in_multi_exec
-    assert_raise(RuntimeError) do
-      r.multi do |multi|
-        multi.set "bar", "s2"
-        raise "Some error"
-        multi.set "baz", "s3"
-      end
-    end
-
-    assert_equal nil, r.get("bar")
-    assert_equal nil, r.get("baz")
-  end
-
-  def test_transformed_replies_as_return_values_for_multi_exec_block
-    info, _ = r.multi do |m|
-      r.info
-    end
-
-    assert info.kind_of?(Hash)
-  end
-
-  def test_transformed_replies_inside_multi_exec_block
-    r.multi do |m|
-      @info = r.info
-    end
-
-    assert @info.value.kind_of?(Hash)
-  end
-
-  def test_raise_command_errors_in_multi_exec
-    assert_raise(Redis::CommandError) do
-      r.multi do |m|
-        m.set("foo", "s1")
-        m.incr("foo") # not an integer
-        m.lpush("foo", "value") # wrong kind of value
-      end
-    end
-
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_raise_command_errors_when_accessing_futures_after_multi_exec
-    begin
-      r.multi do |m|
-        m.set("foo", "s1")
-        @counter = m.incr("foo") # not an integer
-      end
-    rescue Exception
-      # Not gonna deal with it
-    end
-
-    # We should test for Redis::Error here, but hiredis doesn't yet do
-    # custom error classes.
-    err = nil
-    begin
-      @counter.value
-    rescue => err
-    end
-
-    assert err.kind_of?(RuntimeError)
-  end
-
-  def test_multi_with_a_block_yielding_the_client
-    r.multi do |multi|
-      multi.set "foo", "s1"
-    end
-
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_raise_command_error_when_exec_fails
-    redis_mock(:exec => lambda { |*_| "-ERROR" }) do |redis|
-      assert_raise(Redis::CommandError) do
-        redis.multi do |m|
-          m.set "foo", "s1"
-        end
-      end
-    end
-  end
-
-  def test_watch
-    res = r.watch "foo"
-
-    assert_equal "OK", res
-  end
-
-  def test_watch_with_an_unmodified_key
-    r.watch "foo"
-    r.multi do |multi|
-      multi.set "foo", "s1"
-    end
-
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_watch_with_an_unmodified_key_passed_as_array
-    r.watch ["foo", "bar"]
-    r.multi do |multi|
-      multi.set "foo", "s1"
-    end
-
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_watch_with_a_modified_key
-    r.watch "foo"
-    r.set "foo", "s1"
-    res = r.multi do |multi|
-      multi.set "foo", "s2"
-    end
-
-    assert_equal nil, res
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_watch_with_a_modified_key_passed_as_array
-    r.watch ["foo", "bar"]
-    r.set "foo", "s1"
-    res = r.multi do |multi|
-      multi.set "foo", "s2"
-    end
-
-    assert_equal nil, res
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_watch_with_a_block_and_an_unmodified_key
-    result = r.watch "foo" do |rd|
-
-      assert_same r, rd
-
-      rd.multi do |multi|
-        multi.set "foo", "s1"
-      end
-    end
-
-    assert_equal ["OK"], result
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_watch_with_a_block_and_a_modified_key
-    result = r.watch "foo" do |rd|
-
-      assert_same r, rd
-
-      rd.set "foo", "s1"
-      rd.multi do |multi|
-        multi.set "foo", "s2"
-      end
-    end
-
-    assert_equal nil, result
-    assert_equal "s1", r.get("foo")
-  end
-
-  def test_watch_with_a_block_that_raises_an_exception
-    r.set("foo", "s1")
-
-    begin
-      r.watch "foo" do
-        raise "test"
-      end
-    rescue RuntimeError
-    end
-
-    r.set("foo", "s2")
-
-    # If the watch was still set from within the block above, this multi/exec
-    # would fail. This proves that raising an exception above unwatches.
-    r.multi do |multi|
-      multi.set "foo", "s3"
-    end
-
-    assert_equal "s3", r.get("foo")
-  end
-
-  def test_unwatch_with_a_modified_key
-    r.watch "foo"
-    r.set "foo", "s1"
-    r.unwatch
-    r.multi do |multi|
-      multi.set "foo", "s2"
-    end
-
-    assert_equal "s2", r.get("foo")
-  end
-end