From 29ea022603d12597586dda697bb9011f108405d4 Mon Sep 17 00:00:00 2001 From: Nick Muerdter <12112+GUI@users.noreply.github.com> Date: Mon, 12 Feb 2024 08:47:35 -0700 Subject: [PATCH] Try to fix CI issue with TrafficServer not starting again after test. --- test/processes/test_fluent_bit.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/processes/test_fluent_bit.rb b/test/processes/test_fluent_bit.rb index 7cb848165..4e9ffc04a 100644 --- a/test/processes/test_fluent_bit.rb +++ b/test/processes/test_fluent_bit.rb @@ -99,6 +99,9 @@ def test_opensearch_error_log_to_console # Test the temporary workaround for trafficserver's error.log not being able # to direct to stderr. Can probably remove once we're on TrafficServer 10+. def test_trafficserver_error_log_to_console + error_log_path = File.join($config["log_dir"], "trafficserver/error.log") + FileUtils.rm_f(error_log_path) + override_config({ "log" => { "destination" => "console", @@ -109,10 +112,12 @@ def test_trafficserver_error_log_to_console # Not obvious how to actually trigger content to the error.log, so # manually append some content to simulate this. error_content = SecureRandom.uuid - File.write(File.join($config["log_dir"], "trafficserver/error.log"), "#{error_content}\n", mode: "a+") + File.write(error_log_path, "#{error_content}\n", mode: "a+") log = log_tail.read_until(/#{error_content}/, timeout: 30) assert_match(/trafficserver:.*{"log"=>"#{error_content}"}/, log) + ensure + FileUtils.rm_f(error_log_path) end end