More unit test fixes.

Distro A, OPSEC #4584. You may have additional rights; please see https://rosmilitary.org/faq/?category=ros-2-license

Signed-off-by: matthew.lanting <[email protected]>

Author: mlanting

launch_ros/launch_ros/descriptions/node.py

@@ -273,7 +273,7 @@ def _create_params_file_from_dict(self, params):
 
     def _get_parameter_rule(self, param: 'Parameter', context: LaunchContext):
         name, value = param.evaluate(context)
-        return f'{self.__expanded_node_name}:{name}:={yaml.dump(value)}'
+        return f'{name}:={yaml.dump(value)}'
 
     def prepare(self, context: LaunchContext, executable: Executable, action: Action) -> None:
         self._perform_substitutions(context, executable)
@@ -385,7 +385,7 @@ def _perform_substitutions(self, context: LaunchContext, executable: Executable)
         if self.__expanded_remappings:
             cmd_ext = []
             for src, dst in self.__expanded_remappings:
-                cmd_ext.extend(['-r', f'{self.__expanded_node_name}:{src}:={dst}'])
+                cmd_ext.extend(['-r', f'{src}:={dst}'])
             cmd.extend([normalize_to_list_of_substitutions(x) for x in cmd_ext])
         # Prepare the ros_specific_arguments list and add it to the context so that the
         # LocalSubstitution placeholders added to the the cmd can be expanded using the contents.

test_launch_ros/test/test_launch_ros/actions/test_node.py

@@ -195,11 +195,11 @@ def test_launch_node_with_parameter_descriptions(self):
             name, value = item.split(':=')
             parameters.append((name, yaml.safe_load(value)))
         assert parameters == [
-            ('my_node:param1', 'param1_value'),
-            ('my_node:param2', ['param2', '_value']),
-            ('my_node:param_group1.list_params', [1.2, 3.4]),
-            ('my_node:param_group1.param_group2.param2_values', ['param2_value']),
-            ('my_node:param3', ''),
+            ('param1', 'param1_value'),
+            ('param2', ['param2', '_value']),
+            ('param_group1.list_params', [1.2, 3.4]),
+            ('param_group1.param_group2.param2_values', ['param2_value']),
+            ('param3', ''),
         ]
 
     def test_launch_node_with_parameter_dict(self):