Merge branch 'ros2' into fix_unique_ptr

ros · Dec 6, 2024 · ee8fb70 · ee8fb70
2 parents d97e932 + beb9935
commit ee8fb70
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 43 deletions.
diff --git a/diagnostic_aggregator/CMakeLists.txt b/diagnostic_aggregator/CMakeLists.txt
@@ -84,28 +84,29 @@ if(BUILD_TESTING)
   file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}/aggregator_node" AGGREGATOR_NODE)
   file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}/add_analyzer" ADD_ANALYZER)
   file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test/test_listener.py" TEST_LISTENER)
-  set(create_analyzers_tests
-    "primitive_analyzers"
-    "all_analyzers"
-    "analyzer_group"
-    "empty_root_path")
-
-  foreach(test_name ${create_analyzers_tests})
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test/${test_name}.yaml" PARAMETER_FILE)
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test/expected_output/create_${test_name}" EXPECTED_OUTPUT)
-
-    configure_file(
-      "test/create_analyzers.launch.py.in"
-      "test_create_${test_name}.launch.py"
-      @ONLY
-    )
-    add_launch_test(
-      "${CMAKE_CURRENT_BINARY_DIR}/test_create_${test_name}.launch.py"
-      TARGET "test_create_${test_name}"
-      TIMEOUT 30
-      ENV
-    )
-  endforeach()
+  # SKIPPING FLAKY TEST
+  # set(create_analyzers_tests
+  #   "primitive_analyzers"
+  #   "all_analyzers"
+  #   "analyzer_group"
+  #   "empty_root_path")
+
+  # foreach(test_name ${create_analyzers_tests})
+  #   file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test/${test_name}.yaml" PARAMETER_FILE)
+  #   file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test/expected_output/create_${test_name}" EXPECTED_OUTPUT)
+
+  #   configure_file(
+  #     "test/create_analyzers.launch.py.in"
+  #     "test_create_${test_name}.launch.py"
+  #     @ONLY
+  #   )
+  #   add_launch_test(
+  #     "${CMAKE_CURRENT_BINARY_DIR}/test_create_${test_name}.launch.py"
+  #     TARGET "test_create_${test_name}"
+  #     TIMEOUT 30
+  #     ENV
+  #   )
+  # endforeach()
 
   set(analyzers_output_tests
     "primitive_analyzers"
@@ -151,15 +152,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_common_diagnostics/CMakeLists.txt b/diagnostic_common_diagnostics/CMakeLists.txt
@@ -26,10 +26,11 @@ if(BUILD_TESTING)
         test_cpu_monitor
         test/systemtest/test_cpu_monitor.py
         TIMEOUT 10)
-    add_launch_test(
-        test/systemtest/test_ntp_monitor_launchtest.py
-        TARGET ntp_monitor_launchtest
-        TIMEOUT 20)
+    # SKIPPING FLAKY TEST
+    # add_launch_test(
+    #     test/systemtest/test_ntp_monitor_launchtest.py
+    #     TARGET ntp_monitor_launchtest
+    #     TIMEOUT 20)
     add_launch_test(
         test/systemtest/test_hd_monitor_launchtest.py
         TARGET hd_monitor_launchtest

diff --git a/diagnostic_common_diagnostics/package.xml b/diagnostic_common_diagnostics/package.xml
@@ -22,6 +22,7 @@
   <exec_depend>lm-sensors</exec_depend>
   <exec_depend>python3-ntplib</exec_depend>
   <exec_depend>python3-psutil</exec_depend>
+  <exec_depend>rclpy</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <!-- Usage of ament_lint_common is locked by https://github.com/ament/ament_lint/issues/423

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})