Merge branch 'ml-qa-repo-logging' into 'master'

Re-enable debug logging of Git commands and output

See merge request gitlab-org/gitlab-ce!22608

2 files changed, 12 insertions, 0 deletions

diff --git a/qa/spec/page/logging_spec.rb b/qa/spec/page/logging_spec.rb
index 9f17de4edbf..9d56353062b 100644
--- a/qa/spec/page/logging_spec.rb
+++ b/qa/spec/page/logging_spec.rb
@@ -3,9 +3,15 @@
 require 'capybara/dsl'
 
 describe QA::Support::Page::Logging do
+  include Support::StubENV
+
   let(:page) { double().as_null_object }
 
   before do
+    logger = Logger.new $stdout
+    logger.level = ::Logger::DEBUG
+    QA::Runtime::Logger.logger = logger
+
     allow(Capybara).to receive(:current_session).and_return(page)
     allow(page).to receive(:current_url).and_return('http://current-url')
     allow(page).to receive(:has_css?).with(any_args).and_return(true)
diff --git a/qa/spec/runtime/logger_spec.rb b/qa/spec/runtime/logger_spec.rb
index 794e1f9bfe6..44be3381bff 100644
--- a/qa/spec/runtime/logger_spec.rb
+++ b/qa/spec/runtime/logger_spec.rb
@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 describe QA::Runtime::Logger do
+  before do
+    logger = Logger.new $stdout
+    logger.level = ::Logger::DEBUG
+    described_class.logger = logger
+  end
+
   it 'logs debug' do
     expect { described_class.debug('test') }.to output(/DEBUG -- : test/).to_stdout_from_any_process
   end