From 6439004161b591e685594dfad834241ff48188d0 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 29 May 2019 13:28:02 +0200 Subject: [PATCH] DEV: do not use STDERR to print tests timestamps (#7629) --- lib/tasks/docker.rake | 4 ++-- script/docker_test.rb | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake index 5351bdc3bcc..6aabe3b9d66 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -48,8 +48,8 @@ def run_or_fail_prettier(*patterns) end end -def log(msg) - STDERR.puts "#{Time.now.iso8601}: #{msg}" +def log(message) + puts "[#{DateTime.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}" end desc 'Run all tests (JS and code in a standalone environment)' diff --git a/script/docker_test.rb b/script/docker_test.rb index 2ed28bf8388..eeae0f29b19 100644 --- a/script/docker_test.rb +++ b/script/docker_test.rb @@ -10,11 +10,12 @@ puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"] -def log(msg) - STDERR.puts "#{Time.now.iso8601}: #{msg}" +def log(message) + puts "[#{DateTime.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}" end def run_or_fail(command) + log(command) pid = Process.spawn(command) Process.wait(pid) exit 1 unless $?.exitstatus == 0 @@ -23,20 +24,16 @@ end unless ENV['NO_UPDATE'] puts "travis_fold:start:pulling_latest_discourse" if ENV["TRAVIS"] - log("Reseting git repository") run_or_fail("git reset --hard") - log("Pulling git repository") run_or_fail("git pull") - log("Checking out git branch") checkout = ENV['COMMIT_HASH'] || "HEAD" run_or_fail("git checkout #{checkout}") puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"] puts "travis_fold:start:bundle" if ENV["TRAVIS"] - log("Run bundler") run_or_fail("bundle") puts "travis_fold:end:bundle" if ENV["TRAVIS"]