1 files changed, 39 insertions, 14 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/transaction_test.rb b/activerecord/test/cases/adapters/postgresql/transaction_test.rb
index e76705a802..d992e22305 100644
--- a/activerecord/test/cases/adapters/postgresql/transaction_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/transaction_test.rb
@@ -1,21 +1,21 @@
 require "cases/helper"
-require 'support/connection_helper'
+require "support/connection_helper"
 
 module ActiveRecord
   class PostgresqlTransactionTest < ActiveRecord::PostgreSQLTestCase
     self.use_transactional_tests = false
 
     class Sample < ActiveRecord::Base
-      self.table_name = 'samples'
+      self.table_name = "samples"
     end
 
     setup do
       @connection = ActiveRecord::Base.connection
 
       @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
 
@@ -23,12 +23,12 @@ 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
+    test "raises SerializationFailure when a serialization failure occurs" do
       with_warning_suppression do
-        assert_raises(ActiveRecord::TransactionSerializationError) do
+        assert_raises(ActiveRecord::SerializationFailure) do
           thread = Thread.new do
             Sample.transaction isolation: :serializable do
               Sample.delete_all
@@ -51,8 +51,33 @@ module ActiveRecord
 
               Sample.create value: i
             end
+          end
+
+          thread.join
+        end
+      end
+    end
+
+    test "raises Deadlocked when a deadlock is encountered" do
+      with_warning_suppression do
+        assert_raises(ActiveRecord::Deadlocked) do
+          s1 = Sample.create value: 1
+          s2 = Sample.create value: 2
 
+          thread = Thread.new do
+            Sample.transaction do
+              s1.lock!
+              sleep 1
+              s2.update_attributes value: 1
+            end
+          end
+
+          sleep 0.5
+
+          Sample.transaction do
+            s2.lock!
             sleep 1
+            s1.update_attributes value: 2
           end
 
           thread.join
@@ -62,11 +87,11 @@ module ActiveRecord
 
     protected
 
-    def with_warning_suppression
-      log_level = @connection.client_min_messages
-      @connection.client_min_messages = 'error'
-      yield
-      @connection.client_min_messages = log_level
-    end
+      def with_warning_suppression
+        log_level = @connection.client_min_messages
+        @connection.client_min_messages = "error"
+        yield
+        @connection.client_min_messages = log_level
+      end
   end
 end