Skip to content

Commit e9c496a

Browse files
committed
test_supervisor: add tests for log message
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 7ee9a9b commit e9c496a

File tree

1 file changed

+53
-0
lines changed

1 file changed

+53
-0
lines changed

test/test_supervisor.rb

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,8 @@ def test_stop_parallel_old_supervisor_after_delay
12091209
EOF
12101210

12111211
supervisor = Fluent::Supervisor.new({ config_path: "#{@tmp_dir}/fluent.conf" })
1212+
stub(supervisor).setup_global_logger { create_debug_dummy_logger }
1213+
12121214
supervisor.configure(supervisor: true)
12131215
elements = supervisor.instance_variable_get(:@conf).elements
12141216
assert_equal(4, elements.size)
@@ -1229,10 +1231,40 @@ def test_stop_parallel_old_supervisor_after_delay
12291231
assert_equal('source', elements[3].name)
12301232
assert_equal('obsolete_plugins', elements[3]['@type'])
12311233

1234+
skipped_files = %W[
1235+
#{@config_include_dir}/common_param.conf
1236+
#{@config_include_dir}/forward.conf
1237+
#{@config_include_dir}/system.conf
1238+
]
1239+
loaded_files = %W[
1240+
#{@config_include_dir}/obsolete_plugins.conf
1241+
]
1242+
1243+
logs_line = $log.out.logs.join
1244+
skipped_files.each do |path|
1245+
assert { logs_line.include?("skip auto loading, it was already loaded path=\"#{path}\"") }
1246+
end
1247+
loaded_files.each do |path|
1248+
assert { logs_line.include?("loading additional configuration file path=\"#{path}\"") }
1249+
end
1250+
12321251
# reload
1252+
$log.out.reset
12331253
supervisor.__send__(:reload_config)
12341254
reload_elements = supervisor.instance_variable_get(:@conf).elements
1255+
sleep 0.2 # wait to finish reloading
1256+
12351257
assert_equal(elements, reload_elements)
1258+
1259+
logs_line = $log.out.logs.join
1260+
skipped_files.each do |path|
1261+
assert { logs_line.include?("skip auto loading, it was already loaded path=\"#{path}\"") }
1262+
end
1263+
loaded_files.each do |path|
1264+
assert { logs_line.include?("loading additional configuration file path=\"#{path}\"") }
1265+
end
1266+
ensure
1267+
$log.out.reset if $log&.out&.respond_to?(:reset)
12361268
end
12371269

12381270
test "can load partial config loaded config_include_dir feature by even if already loaded" do
@@ -1274,6 +1306,8 @@ def test_stop_parallel_old_supervisor_after_delay
12741306
EOF
12751307

12761308
supervisor = Fluent::Supervisor.new({ config_path: "#{@tmp_dir}/fluent.conf" })
1309+
stub(supervisor).setup_global_logger { create_debug_dummy_logger }
1310+
12771311
supervisor.configure(supervisor: true)
12781312
elements = supervisor.instance_variable_get(:@conf).elements
12791313
assert_equal(4, elements.size)
@@ -1294,6 +1328,25 @@ def test_stop_parallel_old_supervisor_after_delay
12941328

12951329
assert_equal('source', elements[3].name)
12961330
assert_equal('obsolete_plugins', elements[3]['@type'])
1331+
1332+
skipped_files = %W[
1333+
#{@config_include_dir}/common_param.conf
1334+
#{@config_include_dir}/system.conf
1335+
]
1336+
loaded_files = %W[
1337+
#{@config_include_dir}/forward.conf
1338+
#{@config_include_dir}/obsolete_plugins.conf
1339+
]
1340+
1341+
logs_line = $log.out.logs.join
1342+
skipped_files.each do |path|
1343+
assert { logs_line.include?("skip auto loading, it was already loaded path=\"#{path}\"") }
1344+
end
1345+
loaded_files.each do |path|
1346+
assert { logs_line.include?("loading additional configuration file path=\"#{path}\"") }
1347+
end
1348+
ensure
1349+
$log.out.reset if $log&.out&.respond_to?(:reset)
12971350
end
12981351
end
12991352

0 commit comments

Comments
 (0)