Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ros2-humble] Skipping flaky tests (#413) #414

Merged
merged 1 commit into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions diagnostic_aggregator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
21 changes: 9 additions & 12 deletions diagnostic_updater/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,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>
)
ament_target_dependencies(
status_msg_test
"diagnostic_msgs"
"rclcpp"
)
# 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})
Expand Down
Loading