Re-enable executor test on rmw_connextdds. (ros2#2693)

It supports the events executor now, so re-enable the test. Signed-off-by: Chris Lalancette <[email protected]>
HarunTeper · Dec 9, 2024 · 537b2c0 · 537b2c0
1 parent fa95b39
commit 537b2c0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp
@@ -861,6 +861,7 @@ TYPED_TEST(TestExecutors, releaseOwnershipEntityAfterSpinningCancel)
 TYPED_TEST(TestExecutors, testRaceDropCallbackGroupFromSecondThread)
 {
   using ExecutorType = TypeParam;
+<<<<<<< HEAD
 <<<<<<< HEAD
 
   // Create an executor
@@ -879,6 +880,8 @@ TYPED_TEST(TestExecutors, testRaceDropCallbackGroupFromSecondThread)
   {
     GTEST_SKIP();
   }
+=======
+>>>>>>> d7245365 (Re-enable executor test on rmw_connextdds. (#2693))
 
   // Create an executor
   ExecutorType executor;