@@ -480,28 +480,14 @@ TYPED_TEST(TestExecutors, spin_some)
480
480
481
481
// The purpose of this test is to check that the ExecutorT.spin_some() method:
482
482
// - does not continue executing after max_duration has elapsed
483
- TYPED_TEST (TestExecutors, spin_some_max_duration)
483
+ // TODO(wjwwood): The `StaticSingleThreadedExecutor`
484
+ // do not properly implement max_duration (it seems), so disable this test
485
+ // for them in the meantime.
486
+ // see: https://github.com/ros2/rclcpp/issues/2462
487
+ TYPED_TEST (TestExecutorsStable, spin_some_max_duration)
484
488
{
485
489
using ExecutorType = TypeParam;
486
490
487
- // TODO(wjwwood): The `StaticSingleThreadedExecutor`
488
- // do not properly implement max_duration (it seems), so disable this test
489
- // for them in the meantime.
490
- // see: https://github.com/ros2/rclcpp/issues/2462
491
- #ifdef __clang__
492
- # pragma clang diagnostic push
493
- # pragma clang diagnostic ignored "-Wdeprecated-declarations"
494
- #endif
495
-
496
- if (
497
- std::is_same<ExecutorType, DeprecatedStaticSingleThreadedExecutor>())
498
- {
499
- GTEST_SKIP ();
500
- }
501
- #ifdef __clang__
502
- # pragma clang diagnostic pop
503
- #endif
504
-
505
491
// Use an isolated callback group to avoid interference from any housekeeping
506
492
// items that may be in the default callback group of the node.
507
493
constexpr bool automatically_add_to_executor_with_node = false ;
@@ -655,13 +641,6 @@ TYPED_TEST(TestExecutors, testSpinUntilFutureCompleteInterrupted)
655
641
TYPED_TEST (TestExecutors, testRaceConditionAddNode)
656
642
{
657
643
using ExecutorType = TypeParam;
658
- // rmw_connextdds doesn't support events-executor
659
- if (
660
- std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
661
- std::string (rmw_get_implementation_identifier ()).find (" rmw_connextdds" ) == 0 )
662
- {
663
- GTEST_SKIP ();
664
- }
665
644
666
645
// Spawn some threads to do some heavy work
667
646
std::atomic<bool > should_cancel = false ;
0 commit comments