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

clalancette · HarunTeper · commit 537b2c07133f · 2024-12-09T14:24:34.000+01:00
It supports the events executor now, so re-enable the test.

Signed-off-by: Chris Lalancette &lt;clalancette@gmail.com&gt;
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;

Original file line number	Diff line number	Diff line change
`@@ -861,6 +861,7 @@ TYPED_TEST(TestExecutors, releaseOwnershipEntityAfterSpinningCancel)`
`861`	`861`	`TYPED_TEST(TestExecutors, testRaceDropCallbackGroupFromSecondThread)`
`862`	`862`	`{`
`863`	`863`	`using ExecutorType = TypeParam;`
	`864`	`+<<<<<<< HEAD`
`864`	`865`	`<<<<<<< HEAD`
`865`	`866`
`866`	`867`	`// Create an executor`
`@@ -879,6 +880,8 @@ TYPED_TEST(TestExecutors, testRaceDropCallbackGroupFromSecondThread)`
`879`	`880`	`{`
`880`	`881`	`GTEST_SKIP();`
`881`	`882`	`}`
	`883`	`+=======`
	`884`	`+>>>>>>> d7245365 (Re-enable executor test on rmw_connextdds. (#2693))`
`882`	`885`
`883`	`886`	`// Create an executor`
`884`	`887`	`ExecutorType executor;`