From 4efbbc844b3cd5f76e0e24ae1a1f90bb57da3b18 Mon Sep 17 00:00:00 2001
From: fatkodima <fatkodima@rambler.ru>
Date: Thu, 14 Dec 2017 17:05:13 +0200
Subject: Add support for connection pooling on RedisCacheStore

---
 .../test/cache/stores/mem_cache_store_test.rb      | 55 ++--------------------
 1 file changed, 5 insertions(+), 50 deletions(-)

(limited to 'activesupport/test/cache/stores/mem_cache_store_test.rb')

diff --git a/activesupport/test/cache/stores/mem_cache_store_test.rb b/activesupport/test/cache/stores/mem_cache_store_test.rb
index 7f537c3bbf..ccb3b7403f 100644
--- a/activesupport/test/cache/stores/mem_cache_store_test.rb
+++ b/activesupport/test/cache/stores/mem_cache_store_test.rb
@@ -45,56 +45,7 @@ class MemCacheStoreTest < ActiveSupport::TestCase
   include CacheIncrementDecrementBehavior
   include EncodedKeyCacheBehavior
   include AutoloadingCacheBehavior
-
-  def test_connection_pool
-    emulating_latency do
-      begin
-        cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, pool_size: 2, pool_timeout: 1)
-        cache.clear
-
-        threads = []
-
-        assert_raises Timeout::Error do
-          # One of the three threads will fail in 1 second because our pool size
-          # is only two.
-          3.times do
-            threads << Thread.new do
-              cache.read("latency")
-            end
-          end
-
-          threads.each(&:join)
-        end
-      ensure
-        threads.each(&:kill)
-      end
-    end
-  end
-
-  def test_no_connection_pool
-    emulating_latency do
-      begin
-        cache = ActiveSupport::Cache.lookup_store(:mem_cache_store)
-        cache.clear
-
-        threads = []
-
-        assert_nothing_raised do
-          # Default connection pool size is 5, assuming 10 will make sure that
-          # the connection pool isn't used at all.
-          10.times do
-            threads << Thread.new do
-              cache.read("latency")
-            end
-          end
-
-          threads.each(&:join)
-        end
-      ensure
-        threads.each(&:kill)
-      end
-    end
-  end
+  include ConnectionPoolBehavior
 
   def test_raw_values
     cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, raw: true)
@@ -154,6 +105,10 @@ class MemCacheStoreTest < ActiveSupport::TestCase
 
   private
 
+    def store
+      :mem_cache_store
+    end
+
     def emulating_latency
       old_client = Dalli.send(:remove_const, :Client)
       Dalli.const_set(:Client, SlowDalliClient)
-- 
cgit v1.2.3