From 2f71d6e249f626772da3f8a1bb7c8d141d9d0d52 Mon Sep 17 00:00:00 2001 From: Alberto Soragna Date: Fri, 6 Sep 2024 14:18:03 +0200 Subject: [PATCH] remove unnecessary gtest-skip in test_executors (#2600) Signed-off-by: Alberto Soragna --- .../test/rclcpp/executors/test_executors.cpp | 31 +++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp index 8e0b0c875f..cea0900a39 100644 --- a/rclcpp/test/rclcpp/executors/test_executors.cpp +++ b/rclcpp/test/rclcpp/executors/test_executors.cpp @@ -480,28 +480,14 @@ TYPED_TEST(TestExecutors, spin_some) // The purpose of this test is to check that the ExecutorT.spin_some() method: // - does not continue executing after max_duration has elapsed -TYPED_TEST(TestExecutors, spin_some_max_duration) +// TODO(wjwwood): The `StaticSingleThreadedExecutor` +// do not properly implement max_duration (it seems), so disable this test +// for them in the meantime. +// see: https://github.com/ros2/rclcpp/issues/2462 +TYPED_TEST(TestExecutorsStable, spin_some_max_duration) { using ExecutorType = TypeParam; - // TODO(wjwwood): The `StaticSingleThreadedExecutor` - // do not properly implement max_duration (it seems), so disable this test - // for them in the meantime. - // see: https://github.com/ros2/rclcpp/issues/2462 -#ifdef __clang__ -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdeprecated-declarations" -#endif - - if ( - std::is_same()) - { - GTEST_SKIP(); - } -#ifdef __clang__ -# pragma clang diagnostic pop -#endif - // Use an isolated callback group to avoid interference from any housekeeping // items that may be in the default callback group of the node. constexpr bool automatically_add_to_executor_with_node = false; @@ -655,13 +641,6 @@ TYPED_TEST(TestExecutors, testSpinUntilFutureCompleteInterrupted) TYPED_TEST(TestExecutors, testRaceConditionAddNode) { using ExecutorType = TypeParam; - // rmw_connextdds doesn't support events-executor - if ( - std::is_same() && - std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0) - { - GTEST_SKIP(); - } // Spawn some threads to do some heavy work std::atomic should_cancel = false;