diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 11:00:29 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 11:00:29 -0800 |
| commit | 77478f21af980c8879762fc65def8cacba5a7eb7 (patch) | |
| tree | 14e64fc38516d567a659b06dc91a7f0efd9b7d68 /activerecord/test/cases/pooled_connections_test.rb | |
| parent | 7ad6e9bc782df377d500b4ed460c281c6b111e93 (diff) | |
| download | rails-77478f21af980c8879762fc65def8cacba5a7eb7.tar.gz rails-77478f21af980c8879762fc65def8cacba5a7eb7.tar.bz2 rails-77478f21af980c8879762fc65def8cacba5a7eb7.zip | |
Resolve deadlock in pooled connections test
Diffstat (limited to 'activerecord/test/cases/pooled_connections_test.rb')
| -rw-r--r-- | activerecord/test/cases/pooled_connections_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb index f9eea3d118..2529a33dab 100644 --- a/activerecord/test/cases/pooled_connections_test.rb +++ b/activerecord/test/cases/pooled_connections_test.rb @@ -105,7 +105,7 @@ class PooledConnectionsTest < ActiveRecord::TestCase Thread.new do ActiveRecord::Base.connection.rollback_db_transaction ActiveRecord::Base.connection_pool.release_connection - end.join rescue nil + end add_record('three') end |