Skip to content

Commit

Permalink
Disable flaky test_servo_singularity + test_rdf_integration (#1530)
Browse files Browse the repository at this point in the history
  • Loading branch information
sjahr authored Aug 24, 2022
1 parent 40f7f09 commit f7655df
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 28 deletions.
15 changes: 8 additions & 7 deletions moveit_ros/moveit_servo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,15 @@ if(BUILD_TESTING)
ament_target_dependencies(test_servo_collision ${THIS_PACKAGE_INCLUDE_DEPENDS})
add_ros_test(test/launch/test_servo_collision.test.py TIMEOUT 120 ARGS "test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}")

# TODO(sjahr): Debug and re-enable this test
# Servo singularity checking integration test
ament_add_gtest_executable(test_servo_singularity
test/test_servo_singularity.cpp
test/servo_launch_test_common.hpp
)
target_link_libraries(test_servo_singularity ${SERVO_PARAM_LIB_NAME})
ament_target_dependencies(test_servo_singularity ${THIS_PACKAGE_INCLUDE_DEPENDS})
add_ros_test(test/launch/test_servo_singularity.test.py TIMEOUT 120 ARGS "test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}")
#ament_add_gtest_executable(test_servo_singularity
# test/test_servo_singularity.cpp
# test/servo_launch_test_common.hpp
#)
#target_link_libraries(test_servo_singularity ${SERVO_PARAM_LIB_NAME})
#ament_target_dependencies(test_servo_singularity ${THIS_PACKAGE_INCLUDE_DEPENDS})
#add_ros_test(test/launch/test_servo_singularity.test.py TIMEOUT 120 ARGS "test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}")

# pose_tracking
ament_add_gtest_executable(test_servo_pose_tracking
Expand Down
43 changes: 22 additions & 21 deletions moveit_ros/planning/rdf_loader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@ install(DIRECTORY
DESTINATION share/${PROJECT_NAME}/rdf_loader/test
)

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
find_package(ros_testing REQUIRED)

ament_add_gtest_executable(test_rdf_integration
test/test_rdf_integration.cpp
)
target_link_libraries(test_rdf_integration ${MOVEIT_LIB_NAME})
add_ros_test(test/launch/test_rdf_integration.test.py TIMEOUT 120)

add_executable(boring_string_publisher test/boring_string_publisher.cpp)
target_link_libraries(boring_string_publisher ${MOVEIT_LIB_NAME})

install(
TARGETS
test_rdf_integration boring_string_publisher
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION lib/${PROJECT_NAME}
)
endif()
# TODO(sjahr) Debug and re-enable
#if(BUILD_TESTING)
# find_package(ament_cmake_gtest REQUIRED)
# find_package(ros_testing REQUIRED)
#
# ament_add_gtest_executable(test_rdf_integration
# test/test_rdf_integration.cpp
# )
# target_link_libraries(test_rdf_integration ${MOVEIT_LIB_NAME})
# add_ros_test(test/launch/test_rdf_integration.test.py TIMEOUT 120)
#
# add_executable(boring_string_publisher test/boring_string_publisher.cpp)
# target_link_libraries(boring_string_publisher ${MOVEIT_LIB_NAME})
#
# install(
# TARGETS
# test_rdf_integration boring_string_publisher
# ARCHIVE DESTINATION lib
# LIBRARY DESTINATION lib
# RUNTIME DESTINATION lib/${PROJECT_NAME}
# )
#endif()

0 comments on commit f7655df

Please sign in to comment.