Merge branch 'master' into clear_all_environments_log_by_default

1 files changed, 15 insertions, 9 deletions

diff --git a/activerecord/test/cases/adapters/mysql2/transaction_test.rb b/activerecord/test/cases/adapters/mysql2/transaction_test.rb
index edd5353ee3..16101e38cb 100644
--- a/activerecord/test/cases/adapters/mysql2/transaction_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/transaction_test.rb
@@ -10,6 +10,8 @@ module ActiveRecord
     end
 
     setup do
+      @abort, Thread.abort_on_exception = Thread.abort_on_exception, false
+
       @connection = ActiveRecord::Base.connection
       @connection.clear_cache!
 
@@ -25,30 +27,34 @@ module ActiveRecord
 
     teardown do
       @connection.drop_table "samples", if_exists: true
+
+      Thread.abort_on_exception = @abort
     end
 
     test "raises Deadlocked when a deadlock is encountered" do
       assert_raises(ActiveRecord::Deadlocked) do
+        barrier = Concurrent::CyclicBarrier.new(2)
+
         s1 = Sample.create value: 1
         s2 = Sample.create value: 2
 
         thread = Thread.new do
           Sample.transaction do
             s1.lock!
-            sleep 1
+            barrier.wait
             s2.update_attributes value: 1
           end
         end
 
-        sleep 0.5
-
-        Sample.transaction do
-          s2.lock!
-          sleep 1
-          s1.update_attributes value: 2
+        begin
+          Sample.transaction do
+            s2.lock!
+            barrier.wait
+            s1.update_attributes value: 2
+          end
+        ensure
+          thread.join
         end
-
-        thread.join
       end
     end
   end