aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-12-03 11:38:12 +0100
committerYves Senn <yves.senn@gmail.com>2014-12-03 11:38:37 +0100
commit497544f0b3eba83c1385579de50a3d521188e448 (patch)
treeeb6bdc01a7e35b78dd058f9333fb4a44536df240
parent19dfd2f8edf094f5deb9ad1beca7e33be7fc6370 (diff)
downloadrails-497544f0b3eba83c1385579de50a3d521188e448.tar.gz
rails-497544f0b3eba83c1385579de50a3d521188e448.tar.bz2
rails-497544f0b3eba83c1385579de50a3d521188e448.zip
skip test to get `sqlite3_mem` suite passing.
-rw-r--r--activerecord/test/cases/transactions_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 72c07d8aea..cf50bd4ddb 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -496,7 +496,7 @@ class TransactionTest < ActiveRecord::TestCase
# The behavior of killed threads having a status of "aborting" was changed
# in Ruby 2.0, so Thread#kill on 1.9 will prematurely commit the transaction
# and there's nothing we can do about it.
- unless RUBY_VERSION.start_with? '1.9'
+ if !RUBY_VERSION.start_with?('1.9') && !in_memory_db?
def test_rollback_when_thread_killed
queue = Queue.new
thread = Thread.new do