Skip to content

Commit

Permalink
Replace deprecated launch_ros usage (#487)
Browse files Browse the repository at this point in the history 
The Node parameter 'node_executable' has been deprecated and replaced
with the parameter 'executable'.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
  • Loading branch information
@jacobperron
jacobperron committed Apr 16, 2020
1 parent 8ad1208 commit 8a73f34
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions ros2lifecycle/test/test_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ def generate_test_description(rmw_implementation):
# Add test fixture actions.
Node(
package='ros2lifecycle_test_fixtures',
node_executable='simple_lifecycle_node',
executable='simple_lifecycle_node',
node_name='test_lifecycle_node',
output='screen',
additional_env=additional_env
),
Node(
package='ros2lifecycle_test_fixtures',
node_executable='simple_lifecycle_node',
executable='simple_lifecycle_node',
node_name='_hidden_test_lifecycle_node',
output='screen',
additional_env=additional_env
Expand Down
4 changes: 2 additions & 2 deletions ros2node/test/test_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ def generate_test_description(rmw_implementation):
on_exit=[
# Add test fixture actions.
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_complex_node_script],
node_name='complex_node',
additional_env=additional_env
),
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_complex_node_script],
node_name='_hidden_complex_node',
additional_env=additional_env
Expand Down
6 changes: 3 additions & 3 deletions ros2node/test/test_cli_duplicate_node_names.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ def generate_test_description(rmw_implementation, ready_fn):
on_exit=[
# Add test fixture actions.
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_complex_node_script],
node_name='complex_node',
additional_env=additional_env,
),
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_complex_node_script],
node_name='complex_node',
additional_env=additional_env,
),
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_complex_node_script],
node_name='complex_node_2',
additional_env=additional_env,
Expand Down
4 changes: 2 additions & 2 deletions ros2service/test/test_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ def generate_test_description(rmw_implementation):
on_exit=[
# Add test fixture actions.
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_echo_server_script],
node_name='echo_server',
node_namespace='my_ns',
additional_env=additional_env,
),
Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_echo_server_script],
node_name='_hidden_echo_server',
node_namespace='my_ns',
Expand Down
16 changes: 8 additions & 8 deletions ros2topic/test/test_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ def generate_test_description(rmw_implementation):
path_to_listener_node_script = os.path.join(path_to_fixtures, 'listener_node.py')

hidden_talker_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_talker_node_script],
remappings=[('chatter', '_hidden_chatter')],
additional_env=additional_env
)
talker_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_talker_node_script],
additional_env=additional_env
)
listener_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_listener_node_script],
remappings=[('chatter', 'chit_chatter')],
additional_env=additional_env
Expand All @@ -77,22 +77,22 @@ def generate_test_description(rmw_implementation):
path_to_repeater_node_script = os.path.join(path_to_fixtures, 'repeater_node.py')

array_repeater_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_repeater_node_script, 'test_msgs/msg/Arrays'],
node_name='array_repeater',
remappings=[('/array_repeater/output', '/arrays')],
output='screen',
additional_env=additional_env
)
defaults_repeater_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_repeater_node_script, 'test_msgs/msg/Defaults'],
node_name='defaults_repeater',
remappings=[('/defaults_repeater/output', '/defaults')],
additional_env=additional_env,
)
bounded_sequences_repeater_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[
path_to_repeater_node_script, 'test_msgs/msg/BoundedSequences'
],
Expand All @@ -101,7 +101,7 @@ def generate_test_description(rmw_implementation):
additional_env=additional_env
)
unbounded_sequences_repeater_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[
path_to_repeater_node_script, 'test_msgs/msg/UnboundedSequences'
],
Expand All @@ -113,7 +113,7 @@ def generate_test_description(rmw_implementation):
path_to_controller_node_script = os.path.join(path_to_fixtures, 'controller_node.py')

cmd_vel_controller_node_action = Node(
node_executable=sys.executable,
executable=sys.executable,
arguments=[path_to_controller_node_script],
additional_env=additional_env
)
Expand Down

0 comments on commit 8a73f34

Please sign in to comment.