Skip to content

Commit b7f05d9

Browse files
mm318nuclearsandwich
authored andcommitted
remove unit test hack (#368)
Signed-off-by: Miaofei <[email protected]> Signed-off-by: Steven! Ragnarök <[email protected]>
1 parent c6788e4 commit b7f05d9

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

0 commit comments

Comments
 (0)