aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/transactions_test.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-01-05 10:33:05 +0100
committerYves Senn <yves.senn@gmail.com>2015-01-05 10:33:05 +0100
commit5cc08e1977b2904bf4ff958f5a935ae297e5ed49 (patch)
treeadcc061a362295fc3e57987a1f0a1d1be5501d81 /activerecord/test/cases/transactions_test.rb
parent3ae98181433dda1b5e19910e107494762512a86c (diff)
downloadrails-5cc08e1977b2904bf4ff958f5a935ae297e5ed49.tar.gz
rails-5cc08e1977b2904bf4ff958f5a935ae297e5ed49.tar.bz2
rails-5cc08e1977b2904bf4ff958f5a935ae297e5ed49.zip
can't kill thread with in-memory db. fixes `rake test:sqlite3_mem`.
Diffstat (limited to 'activerecord/test/cases/transactions_test.rb')
-rw-r--r--activerecord/test/cases/transactions_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index c4f2ed474d..27a7c9212b 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -504,6 +504,8 @@ class TransactionTest < ActiveRecord::TestCase
end
def test_rollback_when_thread_killed
+ return if in_memory_db?
+
queue = Queue.new
thread = Thread.new do
Topic.transaction do