aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-01-03 08:51:06 +0900
committerGitHub <noreply@github.com>2019-01-03 08:51:06 +0900
commitf04e04b45c6a409b577d96ebccd2617c94729712 (patch)
tree04a9eb0378cb95eb1921f2a46d96ba35e2d23b3d
parent4d651a24ed96d6f350307f3b27900afed6db7e8b (diff)
parent6ea356e9781e7696c48a3f9fc3ecbb0ddda5f198 (diff)
downloadrails-f04e04b45c6a409b577d96ebccd2617c94729712.tar.gz
rails-f04e04b45c6a409b577d96ebccd2617c94729712.tar.bz2
rails-f04e04b45c6a409b577d96ebccd2617c94729712.zip
Merge pull request #34846 from palkan/fix/ar-reaper-test
fix activerecord reaper_test
-rw-r--r--activerecord/test/cases/reaper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb
index b630f782bc..402ddcf05a 100644
--- a/activerecord/test/cases/reaper_test.rb
+++ b/activerecord/test/cases/reaper_test.rb
@@ -48,7 +48,7 @@ module ActiveRecord
reaper = ConnectionPool::Reaper.new(fp, 0.0001)
reaper.run
- until fp.reaped
+ until fp.flushed
Thread.pass
end
assert fp.reaped