Merge branch 'ros2-jazzy' into backport/ros2-jazzy/pr-402

ros · Dec 6, 2024 · bff89e5 · bff89e5
2 parents c91c883 + e09bbbd
commit bff89e5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/diagnostic_aggregator/CMakeLists.txt b/diagnostic_aggregator/CMakeLists.txt
@@ -151,15 +151,17 @@ if(BUILD_TESTING)
     )
   endforeach()
 
-  add_launch_test(
-    test/test_critical_pub.py
-    TIMEOUT 30
-  )
-
-  ament_add_pytest_test(test_discard_behavior
-    "${CMAKE_CURRENT_SOURCE_DIR}/test/test_discard_behavior.py"
-    TIMEOUT 60
-  )
+  # SKIPPING FLAKY TEST
+  # add_launch_test(
+  #   test/test_critical_pub.py
+  #   TIMEOUT 30
+  # )
+
+  # SKIPPING FLAKY TEST
+  # ament_add_pytest_test(test_discard_behavior
+  #   "${CMAKE_CURRENT_SOURCE_DIR}/test/test_discard_behavior.py"
+  #   TIMEOUT 60
+  # )
 endif()
 
 install(

diff --git a/diagnostic_updater/CMakeLists.txt b/diagnostic_updater/CMakeLists.txt
@@ -85,18 +85,19 @@ if(BUILD_TESTING)
     "rclcpp_lifecycle"
     "std_msgs"
   )
-  ament_add_gtest(status_msg_test test/status_msg_test.cpp)
-  target_include_directories(status_msg_test
-    PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-  )
-  target_link_libraries(status_msg_test ${PROJECT_NAME})
+  # SKIPPING FLAKY TEST
+  # ament_add_gtest(status_msg_test test/status_msg_test.cpp)
+  # target_include_directories(status_msg_test
+  #   PUBLIC
+  #   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  #   $<INSTALL_INTERFACE:include>
+  # )
+  # target_link_libraries(status_msg_test ${PROJECT_NAME})
 
   find_package(ament_cmake_pytest REQUIRED)
   ament_add_pytest_test(diagnostic_updater_test.py "test/diagnostic_updater_test.py")
   ament_add_pytest_test(test_DiagnosticStatusWrapper.py "test/test_diagnostic_status_wrapper.py")
-  ament_add_pytest_test(status_msg_test.py "test/status_msg_test.py")
+  # ament_add_pytest_test(status_msg_test.py "test/status_msg_test.py")
 endif()
 
 ament_python_install_package(${PROJECT_NAME})