aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Valena <pvalena@redhat.com>2018-04-30 15:46:02 +0200
committerPavel Valena <pvalena@redhat.com>2018-04-30 17:32:37 +0200
commite04912393a8f52f9bb2f3309c4d24fb8eebdb6d4 (patch)
treec182f89310a7827302ac0a7fd4e16c6a7529dbe2
parent21adf4f4c4f1dc78134c70f610bf999fb88964fb (diff)
downloadrails-e04912393a8f52f9bb2f3309c4d24fb8eebdb6d4.tar.gz
rails-e04912393a8f52f9bb2f3309c4d24fb8eebdb6d4.tar.bz2
rails-e04912393a8f52f9bb2f3309c4d24fb8eebdb6d4.zip
Fix test: threads being nil in ensure
when connection_pool is not installed.
-rw-r--r--activesupport/test/cache/behaviors/connection_pool_behavior.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/test/cache/behaviors/connection_pool_behavior.rb b/activesupport/test/cache/behaviors/connection_pool_behavior.rb
index 701cd75595..4d1901a173 100644
--- a/activesupport/test/cache/behaviors/connection_pool_behavior.rb
+++ b/activesupport/test/cache/behaviors/connection_pool_behavior.rb
@@ -4,13 +4,13 @@ module ConnectionPoolBehavior
def test_connection_pool
Thread.report_on_exception, original_report_on_exception = false, Thread.report_on_exception
+ threads = []
+
emulating_latency do
begin
cache = ActiveSupport::Cache.lookup_store(store, { pool_size: 2, pool_timeout: 1 }.merge(store_options))
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.
@@ -31,13 +31,13 @@ module ConnectionPoolBehavior
end
def test_no_connection_pool
+ threads = []
+
emulating_latency do
begin
cache = ActiveSupport::Cache.lookup_store(store, store_options)
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.