Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pass node to client and service destroy funcs and enable tests for connext #67

Merged
merged 5 commits into from
Oct 29, 2016
Merged

pass node to client and service destroy funcs and enable tests for connext #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
081a588
pass node to client and service destroy funcs
wjwwood Jul 6, 2016
54ea614
address a flaky test with connext, will ticket
wjwwood Oct 27, 2016
596c0ec
invert test_graph exclusion logic
wjwwood Oct 29, 2016
5c98e08
use zero initialization of tnat in test_graph
wjwwood Oct 29, 2016
0d9ecc1
change is_connext logic
wjwwood Oct 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rcl/src/rcl/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ rcl_client_fini(rcl_client_t * client, rcl_node_t * node)
RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT);
if (client->impl) {
rmw_ret_t ret =
rmw_destroy_client(client->impl->rmw_handle);
rmw_destroy_client(rcl_node_get_rmw_handle(node), client->impl->rmw_handle);
if (ret != RMW_RET_OK) {
RCL_SET_ERROR_MSG(rmw_get_error_string_safe());
result = RCL_RET_ERROR;
Expand Down
2 changes: 1 addition & 1 deletion rcl/src/rcl/service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ rcl_service_fini(rcl_service_t * service, rcl_node_t * node)
RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT);
if (service->impl) {
rmw_ret_t ret =
rmw_destroy_service(service->impl->rmw_handle);
rmw_destroy_service(rcl_node_get_rmw_handle(node), service->impl->rmw_handle);
if (ret != RMW_RET_OK) {
RCL_SET_ERROR_MSG(rmw_get_error_string_safe());
result = RCL_RET_ERROR;
Expand Down
11 changes: 7 additions & 4 deletions rcl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,20 @@ function(test_target_function)
AMENT_DEPENDENCIES ${rmw_implementation}
)

# TODO(wjwwood): remove this when the graph API works properly for more than OpenSplice.
if(rmw_implementation STREQUAL "rmw_opensplice_cpp")
# TODO(wjwwood): remove this when the graph API works properly for FastRTPS
if(
rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" OR
rmw_implementation STREQUAL "rmw_fastrtps_cpp"
)
message(STATUS "Skipping test_graph${target_suffix} test.")
else()
rcl_add_custom_gtest(test_graph${target_suffix}
SRCS rcl/test_graph.cpp
ENV ${extra_test_env}
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} "example_interfaces" "std_msgs"
)
else()
message(STATUS "Skipping test_graph${target_suffix} test.")
endif()

rcl_add_custom_gtest(test_rcl${target_suffix}
Expand Down
22 changes: 20 additions & 2 deletions rcl/test/rcl/test_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
# define CLASSNAME(NAME, SUFFIX) NAME
#endif

bool is_connext =
std::string(rmw_get_implementation_identifier()).find("rmw_connext") == 0;

class CLASSNAME (TestGraphFixture, RMW_IMPLEMENTATION) : public ::testing::Test
{
public:
Expand Down Expand Up @@ -254,6 +257,7 @@ check_graph_state(
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe();
rcl_reset_error();

tnat = rcl_get_zero_initialized_topic_names_and_types();
ret = rcl_get_topic_names_and_types(node_ptr, &tnat);
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe();
rcl_reset_error();
Expand Down Expand Up @@ -519,9 +523,23 @@ TEST_F(CLASSNAME(TestGraphFixture, RMW_IMPLEMENTATION), test_rcl_service_server_
std::to_string(time_to_sleep.count()).c_str());
ret = rcl_wait(this->wait_set_ptr, time_to_sleep.count());
if (ret == RCL_RET_TIMEOUT) {
continue;
if (!is_connext) {
// TODO(wjwwood):
// Connext has a race condition which can cause the graph guard
// condition to wake up due to the necessary topics going away,
// but afterwards rcl_service_server_is_available() still does
// not reflect that the service is "no longer available".
// The result is that some tests are flaky unless you not only
// check right after a graph change but again in the future where
// rcl_service_server_is_available() eventually reports the
// service is no longer there. This condition can be removed and
// we can always continue when we get RCL_RET_TIMEOUT once that
// is fixed.
continue;
}
} else {
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe();
}
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe();
ret = rcl_service_server_is_available(this->node_ptr, &client, &is_available);
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe();
if (is_available == expected_state) {
Expand Down