From e92046222527ef76f5ab959cf04db994aa84f355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Tue, 11 Mar 2025 18:43:20 +0100 Subject: [PATCH 1/2] Use rmw_event_type_is_supported to skip tests (#563) Signed-off-by: Alejandro Hernandez Cordero (cherry picked from commit 8d0b7dea57044f14139e9354366f9c1871a47746) # Conflicts: # test_quality_of_service/test/test_deadline.cpp # test_quality_of_service/test/test_liveliness.cpp --- test_quality_of_service/test/test_deadline.cpp | 11 +++++++++++ test_quality_of_service/test/test_liveliness.cpp | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/test_quality_of_service/test/test_deadline.cpp b/test_quality_of_service/test/test_deadline.cpp index 89ebd765..44928b8a 100644 --- a/test_quality_of_service/test/test_deadline.cpp +++ b/test_quality_of_service/test/test_deadline.cpp @@ -32,6 +32,17 @@ using namespace std::chrono_literals; /// Test Deadline with a single publishing node and single subscriber node TEST_F(QosRclcppTestFixture, test_deadline) { +<<<<<<< HEAD +======= + std::string this_rmw_implementation = std::string(rmw_get_implementation_identifier()); + + if (!rmw_event_type_is_supported(RMW_EVENT_OFFERED_DEADLINE_MISSED) || + !rmw_event_type_is_supported(RMW_EVENT_REQUESTED_DEADLINE_MISSED)) + { + GTEST_SKIP(); + } + +>>>>>>> 8d0b7de (Use rmw_event_type_is_supported to skip tests (#563)) int expected_number_of_events = 4; // Bump deadline duration when testing against rmw_connextdds to // cope with the longer discovery times it entails. diff --git a/test_quality_of_service/test/test_liveliness.cpp b/test_quality_of_service/test/test_liveliness.cpp index 767302a6..34ee90ca 100644 --- a/test_quality_of_service/test/test_liveliness.cpp +++ b/test_quality_of_service/test/test_liveliness.cpp @@ -36,6 +36,17 @@ using namespace std::chrono_literals; /// Test Automatic Liveliness with a single publishing node and single subscriber node TEST_F(QosRclcppTestFixture, test_automatic_liveliness_changed) { +<<<<<<< HEAD +======= + std::string this_rmw_implementation = std::string(rmw_get_implementation_identifier()); + + if (!rmw_event_type_is_supported(RMW_EVENT_LIVELINESS_CHANGED) || + !rmw_event_type_is_supported(RMW_EVENT_LIVELINESS_LOST)) + { + GTEST_SKIP(); + } + +>>>>>>> 8d0b7de (Use rmw_event_type_is_supported to skip tests (#563)) const std::chrono::milliseconds max_test_length = 8s; const std::chrono::milliseconds kill_publisher_after = 2s; const std::chrono::milliseconds publish_period = 200ms; From a86bd0cf8bb5f0d934c09d8d31117189edf862f7 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Wed, 12 Mar 2025 12:58:07 +0100 Subject: [PATCH 2/2] Fix merge Signed-off-by: Alejandro Hernandez Cordero --- test_quality_of_service/test/test_deadline.cpp | 3 --- test_quality_of_service/test/test_liveliness.cpp | 5 ----- 2 files changed, 8 deletions(-) diff --git a/test_quality_of_service/test/test_deadline.cpp b/test_quality_of_service/test/test_deadline.cpp index 44928b8a..bb8f33c1 100644 --- a/test_quality_of_service/test/test_deadline.cpp +++ b/test_quality_of_service/test/test_deadline.cpp @@ -32,8 +32,6 @@ using namespace std::chrono_literals; /// Test Deadline with a single publishing node and single subscriber node TEST_F(QosRclcppTestFixture, test_deadline) { -<<<<<<< HEAD -======= std::string this_rmw_implementation = std::string(rmw_get_implementation_identifier()); if (!rmw_event_type_is_supported(RMW_EVENT_OFFERED_DEADLINE_MISSED) || @@ -42,7 +40,6 @@ TEST_F(QosRclcppTestFixture, test_deadline) { GTEST_SKIP(); } ->>>>>>> 8d0b7de (Use rmw_event_type_is_supported to skip tests (#563)) int expected_number_of_events = 4; // Bump deadline duration when testing against rmw_connextdds to // cope with the longer discovery times it entails. diff --git a/test_quality_of_service/test/test_liveliness.cpp b/test_quality_of_service/test/test_liveliness.cpp index 34ee90ca..54a04063 100644 --- a/test_quality_of_service/test/test_liveliness.cpp +++ b/test_quality_of_service/test/test_liveliness.cpp @@ -36,17 +36,12 @@ using namespace std::chrono_literals; /// Test Automatic Liveliness with a single publishing node and single subscriber node TEST_F(QosRclcppTestFixture, test_automatic_liveliness_changed) { -<<<<<<< HEAD -======= - std::string this_rmw_implementation = std::string(rmw_get_implementation_identifier()); - if (!rmw_event_type_is_supported(RMW_EVENT_LIVELINESS_CHANGED) || !rmw_event_type_is_supported(RMW_EVENT_LIVELINESS_LOST)) { GTEST_SKIP(); } ->>>>>>> 8d0b7de (Use rmw_event_type_is_supported to skip tests (#563)) const std::chrono::milliseconds max_test_length = 8s; const std::chrono::milliseconds kill_publisher_after = 2s; const std::chrono::milliseconds publish_period = 200ms;