diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-09-11 14:29:07 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-09-11 14:29:07 -0700 |
| commit | b4b5971ff73f3191be03644fa0c9951a930717d2 (patch) | |
| tree | 417a326bece050159d024e601326a4283be2b4bd /activerecord/test/cases/connection_pool_test.rb | |
| parent | f2a44ade14f995d0574bedf79c8d1bee520f0306 (diff) | |
| parent | 5b7cfc5eeae3c5aa8e2ab5e3a0b9bd63b8465168 (diff) | |
| download | rails-b4b5971ff73f3191be03644fa0c9951a930717d2.tar.gz rails-b4b5971ff73f3191be03644fa0c9951a930717d2.tar.bz2 rails-b4b5971ff73f3191be03644fa0c9951a930717d2.zip | |
Merge pull request #7601 from jrochkind/connection_pool_unify_exceptions
ConnectionPool, unify exceptions, ConnectionTimeoutError
Diffstat (limited to 'activerecord/test/cases/connection_pool_test.rb')
| -rw-r--r-- | activerecord/test/cases/connection_pool_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index 8287b35aaf..0718d0886f 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -89,7 +89,7 @@ module ActiveRecord end def test_full_pool_exception - assert_raises(PoolFullError) do + assert_raises(ConnectionTimeoutError) do (@pool.size + 1).times do @pool.checkout end |