From 2d58e4656090c7ba04740cb605c0233fb3d8a09e Mon Sep 17 00:00:00 2001 From: Sylvain Joyeux Date: Fri, 8 May 2026 21:48:59 -0300 Subject: [PATCH 1/2] fix: warning about orogen model being modified in logging configuration --- lib/syskit/deployment.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/syskit/deployment.rb b/lib/syskit/deployment.rb index a207e510e..975188965 100644 --- a/lib/syskit/deployment.rb +++ b/lib/syskit/deployment.rb @@ -344,7 +344,11 @@ def instanciate_default_logger_task(logger_name) return end - syskit_model = model.resolve_syskit_model_for_deployed_task(orogen_model) + _, syskit_model = + instanciate_deployed_task_resolve_task_model( + logger_name, orogen_model, nil + ) + return unless syskit_model.fullfills?(LoggerService) # Automatic setup by From 81f10ebc0ec537868d97a22bcbdc10733a638ab8 Mon Sep 17 00:00:00 2001 From: Sylvain Joyeux Date: Fri, 8 May 2026 21:49:32 -0300 Subject: [PATCH 2/2] fix: do set use_rock_time_field_for_logging in its testcase The test was being skipped if the flag was never set, but it actually would never be set ever... --- test/live/test_logger_logical_time.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/live/test_logger_logical_time.rb b/test/live/test_logger_logical_time.rb index 54f289ba9..df5380cf2 100644 --- a/test/live/test_logger_logical_time.rb +++ b/test/live/test_logger_logical_time.rb @@ -27,7 +27,9 @@ class LogicalTimeLoggingTest < Syskit::Test::ComponentTest attr_reader :task before do - skip unless Syskit.conf.use_rock_time_field_for_logging? + @__use_rock_time_field_for_logging = + Syskit.conf.use_rock_time_field_for_logging? + Syskit.conf.use_rock_time_field_for_logging = true Syskit.conf.logs.enable_port_logging @task = syskit_deploy( @@ -40,6 +42,8 @@ class LogicalTimeLoggingTest < Syskit::Test::ComponentTest end after do + Syskit.conf.use_rock_time_field_for_logging = + @__use_rock_time_field_for_logging Syskit.conf.logs.disable_port_logging end