Merge branch 'ce-to-ee-2018-10-25' into 'master'

CE upstream - 2018-10-25 23:21 UTC

See merge request gitlab-org/gitlab-ee!8094

qa/qa/git/repository.rb

@@ -113,21 +113,17 @@ module QA
 
       attr_reader :uri, :username, :password, :known_hosts_file, :private_key_file
 
-      def debug?
-        Runtime::Env.respond_to?(:verbose?) && Runtime::Env.verbose?
-      end
-
       def ssh_key_set?
         !private_key_file.nil?
       end
 
       def run(command_str)
         command = [env_vars, command_str, '2>&1'].compact.join(' ')
-        warn "DEBUG: command=[#{command}]" if debug?
+        Runtime::Logger.debug "Git: command=[#{command}]"
 
         output, _ = Open3.capture2(command)
         output = output.chomp.gsub(/\s+$/, '')
-        warn "DEBUG: output=[#{output}]" if debug?
+        Runtime::Logger.debug "Git: output=[#{output}]"
 
         output
       end

qa/qa/runtime/logger.rb

@@ -10,11 +10,13 @@ module QA
       def_delegators :logger, :debug, :info, :warn, :error, :fatal, :unknown
 
       singleton_class.module_eval do
+        attr_writer :logger
+
         def logger
           return @logger if @logger
 
           @logger = ::Logger.new Runtime::Env.log_destination
-          @logger.level = ::Logger::DEBUG
+          @logger.level = Runtime::Env.debug? ? ::Logger::DEBUG : ::Logger::ERROR
           @logger
         end
       end

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)

qa/spec/runtime/logger_spec.rb

 # 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