Skip to content

Commit 097ff29

Browse files
mm318clalancette
authored andcommitted
remove unit test hack (#368)
Signed-off-by: Miaofei <[email protected]>
1 parent 7f6b914 commit 097ff29

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

rcl/test/rcl/test_graph.cpp

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,8 @@ class NodeGraphMultiNodeFixture : public CLASSNAME(TestGraphFixture, RMW_IMPLEME
495495
{
496496
std::vector<rcl_node_t *> node_vec;
497497
node_vec.push_back(this->node_ptr);
498-
if (!(is_opensplice || is_connext)) {
499-
// TODO(ross-desmond): opensplice and connext cannot discover data about
500-
// the current node due to their implementations of Simple Discovery
501-
// Protocol. Should be fixed later.
502-
node_vec.push_back(this->remote_node_ptr);
503-
}
498+
node_vec.push_back(this->remote_node_ptr);
499+
504500
size_t attempts = 20;
505501
bool is_expect = false;
506502
rcl_ret_t ret;
@@ -510,17 +506,16 @@ class NodeGraphMultiNodeFixture : public CLASSNAME(TestGraphFixture, RMW_IMPLEME
510506
bool is_success = true;
511507
// verify each node contains the same node graph.
512508
for (auto node : node_vec) {
513-
if (!(is_opensplice || is_connext)) {
514-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from node");
515-
expect_topics_types(node, sub_func, node_state.subscribers,
516-
test_graph_node_name, is_expect, is_success);
517-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking services from node");
518-
expect_topics_types(node, service_func, node_state.services,
519-
test_graph_node_name, is_expect, is_success);
520-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking publishers from node");
521-
expect_topics_types(node, pub_func, node_state.publishers,
522-
test_graph_node_name, is_expect, is_success);
523-
}
509+
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from node");
510+
expect_topics_types(node, sub_func, node_state.subscribers,
511+
test_graph_node_name, is_expect, is_success);
512+
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking services from node");
513+
expect_topics_types(node, service_func, node_state.services,
514+
test_graph_node_name, is_expect, is_success);
515+
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking publishers from node");
516+
expect_topics_types(node, pub_func, node_state.publishers,
517+
test_graph_node_name, is_expect, is_success);
518+
524519
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from remote node");
525520
expect_topics_types(node, sub_func, remote_node_state.subscribers,
526521
this->remote_node_name, is_expect, is_success);

0 commit comments

Comments
 (0)