diff options
author | George Claghorn <george@basecamp.com> | 2018-01-31 09:49:32 -0500 |
---|---|---|
committer | George Claghorn <george@basecamp.com> | 2018-01-31 09:49:32 -0500 |
commit | 148d0077c539ebca99a8cf776902805da3431f95 (patch) | |
tree | 7d726d1833e0b9929fca14a77c924e337907b4a9 /activesupport/test | |
parent | 8a05dff9f33195e51a4fd4d8168db8b0d7ab19cb (diff) | |
download | rails-148d0077c539ebca99a8cf776902805da3431f95.tar.gz rails-148d0077c539ebca99a8cf776902805da3431f95.tar.bz2 rails-148d0077c539ebca99a8cf776902805da3431f95.zip |
Revert "Merge pull request #31447 from fatkodima/redis_cache-connection_pool"
This reverts commit ac74e2c521f6ddc0eac02d74a1313261bcc1d60f, reversing
changes made to ffdb06136152b3c5f7f4a93ca5928e16e755d228.
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/cache/stores/redis_cache_store_test.rb | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/activesupport/test/cache/stores/redis_cache_store_test.rb b/activesupport/test/cache/stores/redis_cache_store_test.rb index 7c1286a115..62752d2c65 100644 --- a/activesupport/test/cache/stores/redis_cache_store_test.rb +++ b/activesupport/test/cache/stores/redis_cache_store_test.rb @@ -8,18 +8,6 @@ require_relative "../behaviors" module ActiveSupport::Cache::RedisCacheStoreTests DRIVER = %w[ ruby hiredis ].include?(ENV["REDIS_DRIVER"]) ? ENV["REDIS_DRIVER"] : "hiredis" - # Emulates a latency on Redis's back-end for the key latency to facilitate - # connection pool testing. - class SlowRedis < Redis - def get(key, options = {}) - if key =~ /latency/ - sleep 3 - else - super - end - end - end - class LookupTest < ActiveSupport::TestCase test "may be looked up as :redis_cache_store" do assert_kind_of ActiveSupport::Cache::RedisCacheStore, @@ -122,26 +110,6 @@ module ActiveSupport::Cache::RedisCacheStoreTests include AutoloadingCacheBehavior end - class RedisCacheStoreConnectionPoolBehaviourTest < StoreTest - include ConnectionPoolBehavior - - private - - def store - :redis_cache_store - end - - def emulating_latency - old_redis = Object.send(:remove_const, :Redis) - Object.const_set(:Redis, SlowRedis) - - yield - ensure - Object.send(:remove_const, :Redis) - Object.const_set(:Redis, old_redis) - end - end - # Separate test class so we can omit the namespace which causes expected, # appropriate complaints about incompatible string encodings. class KeyEncodingSafetyTest < StoreTest |