Skip to content
Browse files

Resolve deadlock in pooled connections test

  • Loading branch information...
1 parent 7ad6e9b commit 77478f21af980c8879762fc65def8cacba5a7eb7 @jeremy jeremy committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/test/cases/pooled_connections_test.rb
View
2 activerecord/test/cases/pooled_connections_test.rb
@@ -105,7 +105,7 @@ def test_with_connection_nesting_safety
Thread.new do
ActiveRecord::Base.connection.rollback_db_transaction
ActiveRecord::Base.connection_pool.release_connection
- end.join rescue nil
+ end
add_record('three')
end

0 comments on commit 77478f2

Please sign in to comment.
Something went wrong with that request. Please try again.