diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-05 11:42:06 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-05 11:42:15 -0800 |
commit | a640da454fdb9cd8806a1b6bd98c2da93f1b53b9 (patch) | |
tree | a69eff36c33ece5879267886ec20a7a8263fa2ba /actionpack/lib/action_controller/test_case.rb | |
parent | f4f998d60d0d095c7d49a26b6030bee4cf92a5d3 (diff) | |
download | rails-a640da454fdb9cd8806a1b6bd98c2da93f1b53b9.tar.gz rails-a640da454fdb9cd8806a1b6bd98c2da93f1b53b9.tar.bz2 rails-a640da454fdb9cd8806a1b6bd98c2da93f1b53b9.zip |
disable controller / view thread spawning in tests
Tests can (and do) access the database from the main thread. In this
case they were starting a transaction, then making a request. The
request would create a new thread, which would allocate a new database
connection. Since the main thread started a transaction that contains
data that the new thread wants to see, the new thread would not see it
due to data visibility from transactions. Spawning the new thread in
production is fine because middleware should not be doing database
manipulation similar to the test harness. Before 603fe20c it was
possible to set the database connection id based on a thread local, but
603fe20c changes the connection lookup code to never look at the
"connection id" but only at the thread object itself. Without that
indirection, we can't force threads to use the same connection pool as
another thread.
Fixes #23483
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index b43bb9dc17..ac45b2e363 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -12,6 +12,16 @@ module ActionController include Testing::Functional end + module Live + # Disable controller / rendering threads in tests. User tests can access + # the database on the main thread, so they could open a txn, then the + # controller thread will open a new connection and try to access data + # that's only visible to the main thread's txn. This is the problem in #23483 + def new_controller_thread # :nodoc: + yield + end + end + # ActionController::TestCase will be deprecated and moved to a gem in Rails 5.1. # Please use ActionDispatch::IntegrationTest going forward. class TestRequest < ActionDispatch::TestRequest #:nodoc: |