remove unit test hack (#368)

Signed-off-by: Miaofei <miaofei@amazon.com>
This commit is contained in:
M. M 2019-01-29 05:09:12 -08:00 committed by Chris Lalancette
parent 7f6b914ac4
commit 097ff294d0

View file

@ -495,12 +495,8 @@ public:
{ {
std::vector<rcl_node_t *> node_vec; std::vector<rcl_node_t *> node_vec;
node_vec.push_back(this->node_ptr); node_vec.push_back(this->node_ptr);
if (!(is_opensplice || is_connext)) {
// TODO(ross-desmond): opensplice and connext cannot discover data about
// the current node due to their implementations of Simple Discovery
// Protocol. Should be fixed later.
node_vec.push_back(this->remote_node_ptr); node_vec.push_back(this->remote_node_ptr);
}
size_t attempts = 20; size_t attempts = 20;
bool is_expect = false; bool is_expect = false;
rcl_ret_t ret; rcl_ret_t ret;
@ -510,7 +506,6 @@ public:
bool is_success = true; bool is_success = true;
// verify each node contains the same node graph. // verify each node contains the same node graph.
for (auto node : node_vec) { for (auto node : node_vec) {
if (!(is_opensplice || is_connext)) {
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from node"); RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from node");
expect_topics_types(node, sub_func, node_state.subscribers, expect_topics_types(node, sub_func, node_state.subscribers,
test_graph_node_name, is_expect, is_success); test_graph_node_name, is_expect, is_success);
@ -520,7 +515,7 @@ public:
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking publishers from node"); RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking publishers from node");
expect_topics_types(node, pub_func, node_state.publishers, expect_topics_types(node, pub_func, node_state.publishers,
test_graph_node_name, is_expect, is_success); test_graph_node_name, is_expect, is_success);
}
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from remote node"); RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Checking subscribers from remote node");
expect_topics_types(node, sub_func, remote_node_state.subscribers, expect_topics_types(node, sub_func, remote_node_state.subscribers,
this->remote_node_name, is_expect, is_success); this->remote_node_name, is_expect, is_success);