Skip to content

Commit 0ce8efa

Browse files
authored
Rename action_tutorials dependency (#310)
* Rename action_tutorials dependency The original package was refactored into action_tutorials_py and action_tutorials_interfaces in ros2/demos#378 Signed-off-by: Jacob Perron <[email protected]> * Replace ExecuteProcess action with Node action Signed-off-by: Jacob Perron <[email protected]>
1 parent 5878df1 commit 0ce8efa

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

test_ros2cli/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
<maintainer email="[email protected]">Ivan Paunovic</maintainer>
1010
<license>Apache License 2.0</license>
1111

12-
<test_depend>action_tutorials</test_depend>
12+
<test_depend>action_tutorials_interfaces</test_depend>
13+
<test_depend>action_tutorials_py</test_depend>
1314
<test_depend>ament_lint_auto</test_depend>
1415
<test_depend>ament_lint_common</test_depend>
1516
<test_depend>ros_testing</test_depend>

test_ros2cli/test/config_ros2action_test.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,19 @@
1515
import os
1616
import sys
1717

18-
from launch.actions import ExecuteProcess
1918
from launch.substitutions import LaunchConfiguration
2019

21-
from launch_ros.substitutions import ExecutableInPackage
20+
from launch_ros.actions import Node
2221

2322
sys.path.append(os.path.dirname(__file__))
2423

2524
from test_config import TestConfig # noqa
2625

2726

2827
def get_action_server_node_action():
29-
return ExecuteProcess(
30-
cmd=[
31-
sys.executable,
32-
ExecutableInPackage('fibonacci_action_server.py', 'action_tutorials'),
33-
],
28+
return Node(
29+
package='action_tutorials_py',
30+
node_executable='fibonacci_action_server',
3431
sigterm_timeout=LaunchConfiguration('sigterm_timeout', default=30)
3532
)
3633

@@ -68,7 +65,7 @@ def get_action_server_node_action():
6865
arguments=['info', '-t', '/fibonacci'],
6966
actions=[get_action_server_node_action()],
7067
expected_output=common_info_output + [
71-
'/fibonacci_action_server [action_tutorials/action/Fibonacci]'
68+
'/fibonacci_action_server [action_tutorials_interfaces/action/Fibonacci]'
7269
],
7370
),
7471
TestConfig(
@@ -87,7 +84,7 @@ def get_action_server_node_action():
8784
command='action',
8885
arguments=['list', '-t'],
8986
actions=[get_action_server_node_action()],
90-
expected_output=['/fibonacci [action_tutorials/action/Fibonacci]'],
87+
expected_output=['/fibonacci [action_tutorials_interfaces/action/Fibonacci]'],
9188
),
9289
TestConfig(
9390
command='action',
@@ -97,7 +94,12 @@ def get_action_server_node_action():
9794
),
9895
TestConfig(
9996
command='action',
100-
arguments=['send_goal', '/fibonacci', 'action_tutorials/action/Fibonacci', '{order: 5}'],
97+
arguments=[
98+
'send_goal',
99+
'/fibonacci',
100+
'action_tutorials_interfaces/action/Fibonacci',
101+
'{order: 5}'
102+
],
101103
actions=[get_action_server_node_action()],
102104
expected_output=common_send_goal_output,
103105
),
@@ -107,7 +109,7 @@ def get_action_server_node_action():
107109
'send_goal',
108110
'-f',
109111
'/fibonacci',
110-
'action_tutorials/action/Fibonacci',
112+
'action_tutorials_interfaces/action/Fibonacci',
111113
'{order: 5}'
112114
],
113115
actions=[get_action_server_node_action()],
@@ -118,7 +120,7 @@ def get_action_server_node_action():
118120
),
119121
TestConfig(
120122
command='action',
121-
arguments=['show', 'action_tutorials/action/Fibonacci'],
123+
arguments=['show', 'action_tutorials_interfaces/action/Fibonacci'],
122124
expected_output=[
123125
'int32 order',
124126
'---',

0 commit comments

Comments
 (0)