1 files changed, 19 insertions, 26 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/transaction_test.rb b/activerecord/test/cases/adapters/mysql2/transaction_test.rb
index 0e37c70e5c..edd5353ee3 100644
--- a/activerecord/test/cases/adapters/mysql2/transaction_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/transaction_test.rb
@@ -1,12 +1,12 @@
 require "cases/helper"
-require 'support/connection_helper'
+require "support/connection_helper"
 
 module ActiveRecord
   class Mysql2TransactionTest < ActiveRecord::Mysql2TestCase
     self.use_transactional_tests = false
 
     class Sample < ActiveRecord::Base
-      self.table_name = 'samples'
+      self.table_name = "samples"
     end
 
     setup do
@@ -14,9 +14,9 @@ module ActiveRecord
       @connection.clear_cache!
 
       @connection.transaction do
-        @connection.drop_table 'samples', if_exists: true
-        @connection.create_table('samples') do |t|
-          t.integer 'value'
+        @connection.drop_table "samples", if_exists: true
+        @connection.create_table("samples") do |t|
+          t.integer "value"
         end
       end
 
@@ -24,35 +24,28 @@ module ActiveRecord
     end
 
     teardown do
-      @connection.drop_table 'samples', if_exists: true
+      @connection.drop_table "samples", if_exists: true
     end
 
-    test "raises error when a serialization failure occurs" do
-      assert_raises(ActiveRecord::TransactionSerializationError) do
-        thread = Thread.new do
-          Sample.transaction isolation: :serializable do
-            Sample.delete_all
-
-            10.times do |i|
-              sleep 0.1
+    test "raises Deadlocked when a deadlock is encountered" do
+      assert_raises(ActiveRecord::Deadlocked) do
+        s1 = Sample.create value: 1
+        s2 = Sample.create value: 2
 
-              Sample.create value: i
-            end
+        thread = Thread.new do
+          Sample.transaction do
+            s1.lock!
+            sleep 1
+            s2.update_attributes value: 1
           end
         end
 
-        sleep 0.1
-
-        Sample.transaction isolation: :serializable do
-          Sample.delete_all
-
-          10.times do |i|
-            sleep 0.1
-
-            Sample.create value: i
-          end
+        sleep 0.5
 
+        Sample.transaction do
+          s2.lock!
           sleep 1
+          s1.update_attributes value: 2
         end
 
         thread.join