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.

Sign up for GitHub

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

Add tests for user-defined signal handler #215

Merged
merged 4 commits into from
Aug 14, 2017
+193 −5
Merged

Add tests for user-defined signal handler #215

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f14a2f
Add tests for user-defined signal handler
dhood Aug 9, 2017
5647e2b
Skip signal handler tests on Windows
dhood Aug 9, 2017
b40341f
Fixup
dhood Aug 9, 2017
186356c
Remove argument parsing
dhood Aug 9, 2017
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
27 changes: 24 additions & 3 deletions test_rclcpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,18 @@ if(BUILD_TESTING)
# Macro for tests that trigger the shutdown of an executable based on particular console output,
# then check the output of the executable against different console output.
macro(custom_launch_test_executable_output test_name executable)
cmake_parse_arguments(_ARG "SKIP_TEST" "TIMEOUT" "" ${ARGN})
if(_ARG_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "custom_launch_test_executable_output() called with "
"unused arguments: ${_ARG_UNPARSED_ARGUMENTS}")
endif()
if(_ARG_TIMEOUT)
set(_ARG_TIMEOUT "TIMEOUT" "${_ARG_TIMEOUT}")
endif()
if(_ARG_SKIP_TEST)
set(_ARG_SKIP_TEST "SKIP_TEST")
endif()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this macro is only used for internal test I don't think this argument parsing is necessary.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, I thought it was necessary but it was only because I tried to pass ARGN as the last argument to ament_add_nose_test. Removed in 186356c

set(TEST_NAME "${test_name}")
set(TEST_EXECUTABLE "$<TARGET_FILE:${executable}>")
set(TEST_EXECUTABLE_NAME "${executable}")
Expand All @@ -122,7 +134,8 @@ if(BUILD_TESTING)
)
ament_add_nose_test(${test_name}${target_suffix}
"${CMAKE_CURRENT_BINARY_DIR}/${test_name}${target_suffix}_$<CONFIG>.py"
${ARGN}
${_ARG_TIMEOUT}
${_ARG_SKIP_TEST}
APPEND_LIBRARY_DIRS "${append_library_dirs}"
ENV
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
Expand Down Expand Up @@ -195,17 +208,25 @@ if(BUILD_TESTING)
test_client_scope_consistency_server_cpp test_client_scope_consistency_client_cpp
TIMEOUT 30)

# Note (dhood): signal handler tests will be skipped on Windows because there is no opportunity
# for signal handling once shutdown is triggered by launch_testing.
set(SKIP_TEST "")
if(WIN32)
set(SKIP_TEST "SKIP_TEST")
endif()
# Test that a user-defined signal handler is called on interrupt:
# after rclcpp::init has been called, but before rclcpp::shutdown has been called.
custom_launch_test_executable_output(test_signal_handler_before_shutdown
test_signal_handler
TIMEOUT 30)
TIMEOUT 30
${SKIP_TEST})

# Test that a user-defined signal handler is restored after rclcpp::init and rclcpp::shutdown
# have been called.
custom_launch_test_executable_output(test_signal_handler_after_shutdown
test_signal_handler
TIMEOUT 30)
TIMEOUT 30
${SKIP_TEST})
endmacro()

set(append_library_dirs "${CMAKE_CURRENT_BINARY_DIR}")
Expand Down