Skip to content

Commit 37ee1ff

Browse files
Add support for rmw_connextdds (ros2#1574)
* Replace stale reference to Connext * Restore exceptions for ros2/rmw_connext to ease transition to rticommunity/rmw_connextdds Signed-off-by: Andrea Sorbini <[email protected]> Co-authored-by: Chris Lalancette <[email protected]>
1 parent d01a577 commit 37ee1ff

File tree

7 files changed

+2
-25
lines changed

7 files changed

+2
-25
lines changed

rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,10 +511,11 @@ TEST_F(TestAllocatorMemoryStrategy, number_of_entities_with_subscription) {
511511
RclWaitSetSizes expected_sizes = {};
512512
expected_sizes.size_of_subscriptions = 1;
513513
const std::string implementation_identifier = rmw_get_implementation_identifier();
514+
// TODO(asorbini): Remove Connext exception once ros2/rmw_connext is deprecated.
514515
if (implementation_identifier == "rmw_connext_cpp" ||
515516
implementation_identifier == "rmw_cyclonedds_cpp")
516517
{
517-
// For connext, a subscription will also add an event and waitable
518+
// For cyclonedds, a subscription will also add an event and waitable
518519
expected_sizes.size_of_events += 1;
519520
expected_sizes.size_of_waitables += 1;
520521
}

rclcpp/test/rclcpp/test_add_callback_groups_to_executor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
#include "rclcpp/executor.hpp"
3131
#include "rclcpp/rclcpp.hpp"
3232

33-
// Note: This is a long running test with rmw_connext_cpp, if you change this file, please check
34-
// that this test can complete fully, or adjust the timeout as necessary.
35-
// See https://github.com/ros2/rmw_connext/issues/325 for resolution]
36-
3733
using namespace std::chrono_literals;
3834

3935
template<typename T>

rclcpp/test/rclcpp/test_publisher.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929

3030
#include "test_msgs/msg/empty.hpp"
3131

32-
// Note: This is a long running test with rmw_connext_cpp, if you change this file, please check
33-
// that this test can complete fully, or adjust the timeout as necessary.
34-
// See https://github.com/ros2/rmw_connext/issues/325 for resolution
35-
3632
class TestPublisher : public ::testing::Test
3733
{
3834
public:

rclcpp/test/rclcpp/test_subscription.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929

3030
#include "test_msgs/msg/empty.hpp"
3131

32-
// Note: This is a long running test with rmw_connext_cpp, if you change this file, please check
33-
// that this test can complete fully, or adjust the timeout as necessary.
34-
// See https://github.com/ros2/rmw_connext/issues/325 for resolution
35-
3632
using namespace std::chrono_literals;
3733

3834
class TestSubscription : public ::testing::Test

rclcpp_action/test/test_server.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
#include "rclcpp_action/server.hpp"
3030
#include "./mocking_utils/patch.hpp"
3131

32-
// Note: This is a long running test with rmw_connext_cpp, if you change this file, please check
33-
// that this test can complete fully, or adjust the timeout as necessary.
34-
// See https://github.com/ros2/rmw_connext/issues/325 for resolution
35-
3632
using Fibonacci = test_msgs::action::Fibonacci;
3733
using CancelResponse = typename Fibonacci::Impl::CancelGoalService::Response;
3834
using GoalUUID = rclcpp_action::GoalUUID;

rclcpp_lifecycle/test/test_lifecycle_node.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131

3232
#include "./mocking_utils/patch.hpp"
3333

34-
// Note: This is a long running test with rmw_connext_cpp, if you change this file, please check
35-
// that this test can complete fully, or adjust the timeout as necessary.
36-
// See https://github.com/ros2/rmw_connext/issues/325 for resolution
37-
3834
using lifecycle_msgs::msg::State;
3935
using lifecycle_msgs::msg::Transition;
4036

rclcpp_lifecycle/test/test_lifecycle_service_client.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ constexpr char const * node_get_transition_graph_topic =
5252
"/lc_talker/get_transition_graph";
5353
const lifecycle_msgs::msg::State unknown_state = lifecycle_msgs::msg::State();
5454

55-
// Note: This is a long running test with rmw_connext_cpp, if you change this file, please check
56-
// that this test can complete fully, or adjust the timeout as necessary.
57-
// See https://github.com/ros2/rmw_connext/issues/325 for resolution
58-
5955
class EmptyLifecycleNode : public rclcpp_lifecycle::LifecycleNode
6056
{
6157
public:

0 commit comments

Comments
 (0)