Skip to content

Commit dfaa412

Browse files
authored
Merge pull request #331 from ros2/hidmic/complete-action-tests
Completes integration tests for action client/server
2 parents b2694df + aead129 commit dfaa412

File tree

2 files changed

+908
-162
lines changed

2 files changed

+908
-162
lines changed

rcl_action/src/rcl_action/action_client.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ rcl_action_client_get_default_options(void)
243243
#define SEND_SERVICE_REQUEST(Type, request, sequence_number) \
244244
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Sending action " #Type " request"); \
245245
if (!rcl_action_client_is_valid(action_client)) { \
246-
return RCL_RET_ACTION_SERVER_INVALID; /* error already set */ \
246+
return RCL_RET_ACTION_CLIENT_INVALID; /* error already set */ \
247247
} \
248248
RCL_CHECK_ARGUMENT_FOR_NULL(request, RCL_RET_INVALID_ARGUMENT); \
249249
RCL_CHECK_ARGUMENT_FOR_NULL(sequence_number, RCL_RET_INVALID_ARGUMENT); \
@@ -259,7 +259,7 @@ rcl_action_client_get_default_options(void)
259259
#define TAKE_SERVICE_RESPONSE(Type, response_header, response) \
260260
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Taking action " #Type " response"); \
261261
if (!rcl_action_client_is_valid(action_client)) { \
262-
return RCL_RET_ACTION_SERVER_INVALID; /* error already set */ \
262+
return RCL_RET_ACTION_CLIENT_INVALID; /* error already set */ \
263263
} \
264264
RCL_CHECK_ARGUMENT_FOR_NULL(response_header, RCL_RET_INVALID_ARGUMENT); \
265265
RCL_CHECK_ARGUMENT_FOR_NULL(response, RCL_RET_INVALID_ARGUMENT); \

0 commit comments

Comments
 (0)