From 46bd163ee6db72eda3639b177aeaa9c7ea12f847 Mon Sep 17 00:00:00 2001 From: fatkodima Date: Thu, 24 Aug 2023 22:36:10 +0300 Subject: [PATCH 1/2] Fix slow ActiveRecord::QueryCache test --- activerecord/test/cases/query_cache_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index e1a0c609e92a0..43a4031405888 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -584,6 +584,8 @@ def test_query_caching_is_local_to_the_current_thread Thread.new { assert_not ActiveRecord::Base.connection_pool.query_cache_enabled assert_not ActiveRecord::Base.connection.query_cache_enabled + + ActiveRecord::Base.connection_handler.clear_active_connections!(:all) }.join }.call({}) end From df12ca09a04b2791dfdb0e42718dfd6f349106c9 Mon Sep 17 00:00:00 2001 From: fatkodima Date: Thu, 24 Aug 2023 22:36:46 +0300 Subject: [PATCH 2/2] Do not write to debug.log in activerecord tests on CI --- activerecord/test/support/connection.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/activerecord/test/support/connection.rb b/activerecord/test/support/connection.rb index 77adf13bc9202..ec85bc27612b8 100644 --- a/activerecord/test/support/connection.rb +++ b/activerecord/test/support/connection.rb @@ -21,7 +21,13 @@ def self.test_configuration_hashes def self.connect ActiveRecord.async_query_executor = :global_thread_pool puts "Using #{connection_name}" - ActiveRecord::Base.logger = ActiveSupport::Logger.new("debug.log", 1, 100 * 1024 * 1024) + + if ENV["CI"] + ActiveRecord::Base.logger = nil + else + ActiveRecord::Base.logger = ActiveSupport::Logger.new("debug.log", 1, 100.megabytes) + end + ActiveRecord::Base.configurations = test_configuration_hashes ActiveRecord::Base.establish_connection :arunit ARUnit2Model.establish_connection :arunit2