Skip to content

test_console_adapter: fix test failures caused by console gem update #5360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenhys merged 1 commit into from
May 25, 2026
Merged

test_console_adapter: fix test failures caused by console gem update #5360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions test/log/test_console_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ def setup
@logger = ServerEngine::DaemonLogger.new(@logdev)
@fluent_log = Fluent::Log.new(@logger)
@console_logger = Fluent::Log::ConsoleAdapter.wrap(@fluent_log)

# The log format was modified in https://github.com/socketry/console/commit/14cf37da3f5d3a95ba2766a6dbd4dbce87a4588c
@duration_str = if Gem::Version.new(Console::VERSION) >= Gem::Version.new("1.35.0")
" 0.00s"
else
" 0.0s"
end
end

def teardown
Expand Down Expand Up @@ -45,7 +52,7 @@ def test_reflect_log_level(data)
fatal: :fatal)
def test_string_subject(level)
@console_logger.send(level, "subject")
assert_equal(["#{@timestamp_str} [#{level}]: 0.0s: subject\n"],
assert_equal(["#{@timestamp_str} [#{level}]: #{@duration_str}: subject\n"],
@logdev.logs)
end

Expand All @@ -57,7 +64,7 @@ def test_string_subject(level)
def test_args(level)
@console_logger.send(level, "subject", 1, 2, 3)
assert_equal([
"#{@timestamp_str} [#{level}]: 0.0s: subject\n" +
"#{@timestamp_str} [#{level}]: #{@duration_str}: subject\n" +
" | 1\n" +
" | 2\n" +
" | 3\n"
Expand All @@ -76,7 +83,7 @@ def test_options(level)
args = JSON.parse(lines[1..].collect { |str| str.sub(/\s+\|/, "") }.join("\n"))
assert_equal([
1,
"#{@timestamp_str} [#{level}]: 0.0s: subject",
"#{@timestamp_str} [#{level}]: #{@duration_str}: subject",
{ "kwarg1" => "opt1", "kwarg2" => "opt2" }
],
[
Expand All @@ -94,7 +101,7 @@ def test_options(level)
def test_block(level)
@console_logger.send(level, "subject") { "block message" }
assert_equal([
"#{@timestamp_str} [#{level}]: 0.0s: subject\n" +
"#{@timestamp_str} [#{level}]: #{@duration_str}: subject\n" +
" | block message\n"
],
@logdev.logs)
Expand All @@ -109,8 +116,8 @@ def test_multiple_entries(level)
@console_logger.send(level, "subject1")
@console_logger.send(level, "line2")
assert_equal([
"#{@timestamp_str} [#{level}]: 0.0s: subject1\n",
"#{@timestamp_str} [#{level}]: 0.0s: line2\n"
"#{@timestamp_str} [#{level}]: #{@duration_str}: subject1\n",
"#{@timestamp_str} [#{level}]: #{@duration_str}: line2\n"
],
@logdev.logs)
end
Expand Down
Loading