Merge pull request #1153 from supercaracal/fix-cluster-test

Shrink cluster test cases guaranteed by redis-cluster-client and focus on behavior test for method interfaces

Author: byroot

.gitignore

@@ -6,6 +6,7 @@ Gemfile.lock
 /.idea
 /.yardoc
 /.bundle
+/cluster/.bundle
 /coverage/*
 /doc/
 /examples/sentinel/sentinel.conf

cluster/test/abnormal_state_test.rb

@@ -19,23 +19,4 @@ def test_client_can_command_with_replica
       assert_equal i.to_s, r.get("key#{i}")
     end
   end
-
-  def test_client_can_flush_with_replica
-    r = build_another_client(replica: true)
-
-    assert_equal 'OK', r.flushall
-    assert_equal 'OK', r.flushdb
-  end
-
-  def test_some_reference_commands_are_sent_to_slaves_if_needed
-    skip("This test is very flaky") if ENV["CI"]
-    r = build_another_client(replica: true)
-
-    5.times { |i| r.set("key#{i}", i) }
-
-    r.wait(1, TIMEOUT.to_i * 1000)
-
-    assert_equal %w[key0 key1 key2 key3 key4], r.keys
-    assert_equal 5, r.dbsize
-  end
 end

cluster/test/client_replicas_test.rb

@@ -6,69 +6,9 @@
 class TestClusterClientTransactions < Minitest::Test
   include Helper::Cluster
 
-  def test_transaction_with_hash_tag
-    skip("redis-cluster-client doesn't support transaction")
-    rc1 = redis
-    rc2 = build_another_client
-
-    rc1.multi do |cli|
-      100.times { |i| cli.set("{key}#{i}", i) }
-    end
-
-    100.times { |i| assert_equal i.to_s, rc1.get("{key}#{i}") }
-    100.times { |i| assert_equal i.to_s, rc2.get("{key}#{i}") }
-  end
-
-  def test_transaction_without_hash_tag
-    rc1 = redis
-    rc2 = build_another_client
-
+  def test_cluster_client_does_not_support_transaction
     assert_raises(Redis::Cluster::AmbiguousNodeError) do
-      rc1.multi do |cli|
-        100.times { |i| cli.set("key#{i}", i) }
-      end
-    end
-
-    100.times { |i| assert_nil rc1.get("key#{i}") }
-    100.times { |i| assert_nil rc2.get("key#{i}") }
-  end
-
-  def test_transaction_with_replicas
-    skip("redis-cluster-client doesn't support transaction")
-    rc1 = build_another_client(replica: true)
-    rc2 = build_another_client(replica: true)
-
-    rc1.multi do |cli|
-      100.times { |i| cli.set("{key}#{i}", i) }
+      redis.multi { |r| r.set('key', 'foo') }
     end
-
-    rc1.wait(1, TIMEOUT.to_i * 1000)
-
-    100.times { |i| assert_equal i.to_s, rc1.get("{key}#{i}") }
-    100.times { |i| assert_equal i.to_s, rc2.get("{key}#{i}") }
-  end
-
-  def test_transaction_with_watch
-    skip("redis-cluster-client doesn't support transaction")
-    rc1 = redis
-    rc2 = build_another_client
-
-    rc1.set('{key}1', 100)
-    rc1.watch('{key}1')
-
-    rc2.set('{key}1', 200)
-    val = rc1.get('{key}1').to_i
-    val += 1
-
-    rc1.multi do |cli|
-      cli.set('{key}1', val)
-      cli.set('{key}2', 300)
-    end
-
-    assert_equal '200', rc1.get('{key}1')
-    assert_equal '200', rc2.get('{key}1')
-
-    assert_nil rc1.get('{key}2')
-    assert_nil rc2.get('{key}2')
   end
 end