niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

De-flake tests for rmw_connext (#899)

Browse source 
* Remove duplicate tests

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Expand test timeout to 240 seconds for Connext

Signed-off-by: Michael Carroll <michael@openrobotics.org>
This commit is contained in:
Michael Carroll 2019-10-23 10:14:47 -05:00 • committed by GitHub
parent a6e3412bb0
commit 2716d3e81e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rclcpp/CMakeLists.txt
View file

@ -238,7 +238,7 @@ if(BUILD_TESTING)
) )
target_link_libraries(test_loaned_message ${PROJECT_NAME}) target_link_libraries(test_loaned_message ${PROJECT_NAME})
ament_add_gtest(test_node test/test_node.cpp) ament_add_gtest(test_node test/test_node.cpp TIMEOUT 240)
if(TARGET test_node) if(TARGET test_node)
ament_target_dependencies(test_node ament_target_dependencies(test_node
"rcl_interfaces" "rcl_interfaces"

16
rclcpp/test/test_node.cpp
View file

@ -140,22 +140,6 @@ TEST_F(TestNode, subnode_get_name_and_namespace) {
EXPECT_STREQ("sub_ns", subnode->get_sub_namespace().c_str()); EXPECT_STREQ("sub_ns", subnode->get_sub_namespace().c_str());
EXPECT_STREQ("/ns/sub_ns", subnode->get_effective_namespace().c_str()); EXPECT_STREQ("/ns/sub_ns", subnode->get_effective_namespace().c_str());
} }
{
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
auto subnode = node->create_sub_node("sub_ns");
EXPECT_STREQ("my_node", subnode->get_name());
EXPECT_STREQ("/ns", subnode->get_namespace());
EXPECT_STREQ("sub_ns", subnode->get_sub_namespace().c_str());
EXPECT_STREQ("/ns/sub_ns", subnode->get_effective_namespace().c_str());
}
{
auto node = std::make_shared<rclcpp::Node>("my_node");
auto subnode = node->create_sub_node("sub_ns");
EXPECT_STREQ("my_node", subnode->get_name());
EXPECT_STREQ("/", subnode->get_namespace());
EXPECT_STREQ("sub_ns", subnode->get_sub_namespace().c_str());
EXPECT_STREQ("/sub_ns", subnode->get_effective_namespace().c_str());
}
{ {
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns"); auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
auto subnode = node->create_sub_node("sub_ns"); auto subnode = node->create_sub_node("sub_ns");