diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-08 23:12:07 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-08 23:12:07 -0800 |
| commit | e4dc3035ce881baf371a8445391c9ca393406290 (patch) | |
| tree | 7b54662eaa631e0d51fa070f7aa4d6a920d97f3b /activerecord/test | |
| parent | f99b254e4e382ddd2cc86acff9ed80663b8c7817 (diff) | |
| parent | 02a3c0e771b3e09173412f93d8699d4825a366d6 (diff) | |
| download | rails-e4dc3035ce881baf371a8445391c9ca393406290.tar.gz rails-e4dc3035ce881baf371a8445391c9ca393406290.tar.bz2 rails-e4dc3035ce881baf371a8445391c9ca393406290.zip | |
Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe
Reaper has access to threadsafe active? call
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/connection_pool_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/reaper_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index 2da51ea015..1cf215017b 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -142,7 +142,7 @@ module ActiveRecord connections = @pool.connections.dup connections.each do |conn| - conn.extend(Module.new { def active?; false; end; }) + conn.extend(Module.new { def active_threadsafe?; false; end; }) end @pool.reap diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb index e53a27d5dd..b62a41c08e 100644 --- a/activerecord/test/cases/reaper_test.rb +++ b/activerecord/test/cases/reaper_test.rb @@ -69,7 +69,7 @@ module ActiveRecord conn = pool.checkout count = pool.connections.length - conn.extend(Module.new { def active?; false; end; }) + conn.extend(Module.new { def active_threadsafe?; false; end; }) while count == pool.connections.length Thread.pass |