From cd6cd422df9e66c5638ac4b8ede6587b10e49ec3 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 27 Sep 2018 22:36:07 -0700 Subject: [PATCH] Better test logging [skip ci] --- test/support/activerecord.rb | 2 +- test/support/cequel.rb | 2 +- test/support/mongoid.rb | 4 ++-- test/test_helper.rb | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/support/activerecord.rb b/test/support/activerecord.rb index a79a667..37c0f2b 100644 --- a/test/support/activerecord.rb +++ b/test/support/activerecord.rb @@ -1,7 +1,7 @@ require "active_record" # for debugging -ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"] +ActiveRecord::Base.logger = $logger # rails does this in activerecord/lib/active_record/railtie.rb ActiveRecord::Base.default_timezone = :utc diff --git a/test/support/cequel.rb b/test/support/cequel.rb index 7625eb3..fc5bd14 100644 --- a/test/support/cequel.rb +++ b/test/support/cequel.rb @@ -5,7 +5,7 @@ cequel = keyspace: "searchkick_test", default_consistency: :all ) -cequel.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"] +cequel.logger = $logger cequel.schema.drop! if cequel.schema.exists? cequel.schema.create! Cequel::Record.connection = cequel diff --git a/test/support/mongoid.rb b/test/support/mongoid.rb index ad1c0e2..c589d73 100644 --- a/test/support/mongoid.rb +++ b/test/support/mongoid.rb @@ -1,5 +1,5 @@ -Mongoid.logger.level = Logger::INFO -Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger) +Mongoid.logger = $logger +Mongo::Logger.logger = $logger if defined?(Mongo::Logger) Mongoid.configure do |config| config.connect_to "searchkick_test" diff --git a/test/test_helper.rb b/test/test_helper.rb index b4a30f1..b5d4bc0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -10,7 +10,9 @@ Searchkick.index_suffix = ENV["TEST_ENV_NUMBER"] ENV["RACK_ENV"] = "test" -Searchkick.client.transport.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"] +$logger = ActiveSupport::Logger.new(ENV["VERBOSE"] ? STDOUT : nil) + +Searchkick.client.transport.logger = $logger Searchkick.search_timeout = 5 if defined?(Redis) -- libgit2 0.21.0