Merge pull request #57434 from yahonda/yahonda/pg-test-load-async-pool

yahonda · web-flow · commit 84d3c32d026f · 2026-05-22T15:57:54.000+09:00
Run LoadAsync\*ThreadPoolExecutorTest on the replaced pool to prevent connection leak
diff --git a/activerecord/test/cases/relation/load_async_test.rb b/activerecord/test/cases/relation/load_async_test.rb
@@ -415,7 +415,7 @@ class LoadAsyncMultiThreadPoolExecutorTest < ActiveRecord::TestCase
 
       fixtures :posts, :comments
 
-      def setup
+      def before_setup
         @old_config = ActiveRecord.async_query_executor
         ActiveRecord.async_query_executor = :multi_thread_pool
 
@@ -424,9 +424,12 @@ def setup
 
         ActiveRecord::Base.establish_connection(config_hash1)
         ARUnit2Model.establish_connection(config_hash2)
+
+        super
       end
 
-      def teardown
+      def after_teardown
+        super
         ActiveRecord.async_query_executor = @old_config
         clean_up_connection_handler
         ActiveRecord::Base.establish_connection(:arunit)
@@ -554,7 +557,7 @@ class LoadAsyncMixedThreadPoolExecutorTest < ActiveRecord::TestCase
 
       fixtures :posts, :comments, :other_dogs
 
-      def setup
+      def before_setup
         @previous_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "default_env"
         @old_config = ActiveRecord.async_query_executor
         ActiveRecord.async_query_executor = :multi_thread_pool
@@ -570,9 +573,12 @@ def setup
 
         ActiveRecord::Base.establish_connection(:primary)
         ARUnit2Model.establish_connection(:animals)
+
+        super
       end
 
-      def teardown
+      def after_teardown
+        super
         ENV["RAILS_ENV"] = @previous_env
         ActiveRecord::Base.configurations = @prev_configs
         ActiveRecord.async_query_executor = @old_config
