Skip to content

Commit 303f0b1

Browse files
authored
node name print bug fix with ros2 action info. (#926)
Signed-off-by: Tomoya Fujita <[email protected]>
1 parent ddd6146 commit 303f0b1

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

ros2action/ros2action/api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def get_action_clients_and_servers(*, node, action_name):
3434
node_names_and_ns = node.get_node_names_and_namespaces()
3535
for node_name, node_ns in node_names_and_ns:
3636
# Construct fully qualified name
37-
node_fqn = '/'.join(node_ns) + node_name
37+
node_fqn = '/'.join([node_ns, node_name])
3838

3939
# Get any action clients associated with the node
4040
client_names_and_types = node.get_action_client_names_and_types_by_node(

ros2action/test/fixtures/fibonacci_action_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class FibonacciActionServer(Node):
2424

2525
def __init__(self):
26-
super().__init__('fibonacci_action_server')
26+
super().__init__('fibonacci_action_server', namespace='/test')
2727
self._action_server = ActionServer(
2828
self,
2929
Fibonacci,

ros2action/test/test_cli.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,44 +146,46 @@ def test_info_on_nonexistent_action(self):
146146

147147
@launch_testing.markers.retry_on_failure(times=5, delay=1)
148148
def test_fibonacci_info(self):
149-
with self.launch_action_command(arguments=['info', '/fibonacci']) as action_command:
149+
with self.launch_action_command(arguments=['info', '/test/fibonacci']) as action_command:
150150
assert action_command.wait_for_shutdown(timeout=10)
151151
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
152152
assert launch_testing.tools.expect_output(
153153
expected_lines=[
154-
'Action: /fibonacci',
154+
'Action: /test/fibonacci',
155155
'Action clients: 0',
156156
'Action servers: 1',
157-
' /fibonacci_action_server'
157+
' /test/fibonacci_action_server'
158158
],
159159
text=action_command.output,
160160
strict=False
161161
)
162162

163163
@launch_testing.markers.retry_on_failure(times=5, delay=1)
164164
def test_fibonacci_info_with_types(self):
165-
with self.launch_action_command(arguments=['info', '-t', '/fibonacci']) as action_command:
165+
with self.launch_action_command(
166+
arguments=['info', '-t', '/test/fibonacci']) as action_command:
166167
assert action_command.wait_for_shutdown(timeout=10)
167168
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
168169
assert launch_testing.tools.expect_output(
169170
expected_lines=[
170-
'Action: /fibonacci',
171+
'Action: /test/fibonacci',
171172
'Action clients: 0',
172173
'Action servers: 1',
173-
' /fibonacci_action_server [test_msgs/action/Fibonacci]'
174+
' /test/fibonacci_action_server [test_msgs/action/Fibonacci]'
174175
],
175176
text=action_command.output,
176177
strict=False
177178
)
178179

179180
@launch_testing.markers.retry_on_failure(times=5, delay=1)
180181
def test_fibonacci_info_count(self):
181-
with self.launch_action_command(arguments=['info', '-c', '/fibonacci']) as action_command:
182+
with self.launch_action_command(
183+
arguments=['info', '-c', '/test/fibonacci']) as action_command:
182184
assert action_command.wait_for_shutdown(timeout=10)
183185
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
184186
assert launch_testing.tools.expect_output(
185187
expected_lines=[
186-
'Action: /fibonacci',
188+
'Action: /test/fibonacci',
187189
'Action clients: 0',
188190
'Action servers: 1',
189191
],
@@ -197,7 +199,7 @@ def test_list(self):
197199
assert action_command.wait_for_shutdown(timeout=10)
198200
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
199201
assert launch_testing.tools.expect_output(
200-
expected_lines=['/fibonacci'],
202+
expected_lines=['/test/fibonacci'],
201203
text=action_command.output,
202204
strict=True
203205
)
@@ -208,7 +210,7 @@ def test_list_with_types(self):
208210
assert action_command.wait_for_shutdown(timeout=10)
209211
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
210212
assert launch_testing.tools.expect_output(
211-
expected_lines=['/fibonacci [test_msgs/action/Fibonacci]'],
213+
expected_lines=['/test/fibonacci [test_msgs/action/Fibonacci]'],
212214
text=action_command.output, strict=True
213215
)
214216

@@ -223,7 +225,7 @@ def test_list_count(self):
223225

224226
@launch_testing.markers.retry_on_failure(times=5, delay=1)
225227
def test_type(self):
226-
with self.launch_action_command(arguments=['type', '/fibonacci']) as action_command:
228+
with self.launch_action_command(arguments=['type', '/test/fibonacci']) as action_command:
227229
assert action_command.wait_for_shutdown(timeout=10)
228230
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
229231
assert launch_testing.tools.expect_output(
@@ -238,7 +240,7 @@ def test_find(self):
238240
assert action_command.wait_for_shutdown(timeout=10)
239241
assert action_command.exit_code == launch_testing.asserts.EXIT_OK
240242
assert launch_testing.tools.expect_output(
241-
expected_lines=['/fibonacci'],
243+
expected_lines=['/test/fibonacci'],
242244
text=action_command.output, strict=True
243245
)
244246

@@ -257,7 +259,7 @@ def test_send_fibonacci_goal(self):
257259
with self.launch_action_command(
258260
arguments=[
259261
'send_goal',
260-
'/fibonacci',
262+
'/test/fibonacci',
261263
'test_msgs/action/Fibonacci',
262264
'{order: 5}'
263265
],
@@ -275,7 +277,7 @@ def test_send_fibonacci_goal_with_feedback(self):
275277
arguments=[
276278
'send_goal',
277279
'-f',
278-
'/fibonacci',
280+
'/test/fibonacci',
279281
'test_msgs/action/Fibonacci',
280282
'{order: 5}'
281283
],

0 commit comments

Comments
 (0)