From 718810009eb647cc9fead0ad4ebbbc166e50304e Mon Sep 17 00:00:00 2001 From: dhood Date: Fri, 29 Apr 2016 11:46:23 -0700 Subject: [PATCH 1/3] Use RCL_ASSERT_RMW_ID_MATCHES to ensure correct rmw implementation is being used --- intra_process_demo/CMakeLists.txt | 3 ++- pendulum_control/CMakeLists.txt | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/intra_process_demo/CMakeLists.txt b/intra_process_demo/CMakeLists.txt index 431812cdf..a06391e59 100644 --- a/intra_process_demo/CMakeLists.txt +++ b/intra_process_demo/CMakeLists.txt @@ -129,7 +129,8 @@ if(BUILD_TESTING) ament_add_nose_test(test_demo_${exe_list_underscore}${target_suffix} "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}${target_suffix}_$.py" - TIMEOUT 30) + TIMEOUT 30 + ENV RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}) set_tests_properties(test_demo_${exe_list_underscore}${target_suffix} PROPERTIES DEPENDS "test_demo_${exe_list_underscore}${target_suffix} test_demo_${exe_list_underscore}${target_suffix}") endforeach() diff --git a/pendulum_control/CMakeLists.txt b/pendulum_control/CMakeLists.txt index dcd2b7ac3..693cf6ce5 100644 --- a/pendulum_control/CMakeLists.txt +++ b/pendulum_control/CMakeLists.txt @@ -109,13 +109,15 @@ if(BUILD_TESTING) ament_add_nose_test(test_demo_pendulum__${middleware_impl} "${CMAKE_CURRENT_BINARY_DIR}/test_pendulum__${middleware_impl}.py" - TIMEOUT 20) + TIMEOUT 20 + ENV RCL_ASSERT_RMW_ID_MATCHES=${middleware_impl}) set_tests_properties(test_demo_pendulum__${middleware_impl} PROPERTIES DEPENDS "test_demo_pendulum__${middleware_impl} test_demo_pendulum__${middleware_impl}") ament_add_nose_test(test_demo_pendulum_teleop__${middleware_impl} "${CMAKE_CURRENT_BINARY_DIR}/test_pendulum_teleop__${middleware_impl}.py" - TIMEOUT 20) + TIMEOUT 20 + ENV RCL_ASSERT_RMW_ID_MATCHES=${middleware_impl}) set_tests_properties(test_demo_pendulum_teleop__${middleware_impl} PROPERTIES DEPENDS "test_demo_pendulum_teleop__${middleware_impl} test_demo_pendulum_teleop__${middleware_impl}") endif() From 21d8a0fa9a8b03051d6c2c8ea718e4bc449c1034 Mon Sep 17 00:00:00 2001 From: dhood Date: Mon, 16 May 2016 16:45:12 -0700 Subject: [PATCH 2/3] Add ConsoleOuput handler so error messages can be seen --- pendulum_control/test/test_pendulum_demo.py.in | 5 +++-- pendulum_control/test/test_pendulum_teleop.py.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pendulum_control/test/test_pendulum_demo.py.in b/pendulum_control/test/test_pendulum_demo.py.in index b5a68d1db..9b803ac42 100644 --- a/pendulum_control/test/test_pendulum_demo.py.in +++ b/pendulum_control/test/test_pendulum_demo.py.in @@ -1,6 +1,7 @@ import os from launch import LaunchDescriptor from launch.exit_handler import ignore_exit_handler +from launch.output_handler import ConsoleOutput from launch.launcher import DefaultLauncher from launch_testing import create_handler @@ -24,7 +25,7 @@ def test_executable(): cmd=[pendulum_logger_executable], name=pendulum_logger_name, exit_handler=ignore_exit_handler, - output_handlers=[pendulum_logger_handler], + output_handlers=[pendulum_logger_handler, ConsoleOutput()], ) pendulum_demo_executable = '@RCLCPP_DEMO_PENDULUM_DEMO_EXECUTABLE@' @@ -37,7 +38,7 @@ def test_executable(): cmd=[pendulum_demo_executable, '-i', '1000'], name=pendulum_demo_name, exit_handler=ignore_exit_handler, - output_handlers=[pendulum_demo_handler], + output_handlers=[pendulum_demo_handler, ConsoleOutput()], ) launcher = DefaultLauncher() diff --git a/pendulum_control/test/test_pendulum_teleop.py.in b/pendulum_control/test/test_pendulum_teleop.py.in index d6aea2803..049874b2d 100644 --- a/pendulum_control/test/test_pendulum_teleop.py.in +++ b/pendulum_control/test/test_pendulum_teleop.py.in @@ -3,6 +3,7 @@ import sys from launch import LaunchDescriptor from launch.exit_handler import ignore_exit_handler +from launch.output_handler import ConsoleOutput from launch.launcher import DefaultLauncher from launch_testing import create_handler @@ -26,7 +27,7 @@ def test_executable(): cmd=[pendulum_demo_executable, '-i', '0'], name=pendulum_demo_name, exit_handler=ignore_exit_handler, - output_handlers=[pendulum_demo_handler], + output_handlers=[pendulum_demo_handler, ConsoleOutput()], ) pendulum_teleop_executable = '@RCLCPP_DEMO_PENDULUM_TELEOP_EXECUTABLE@' @@ -42,7 +43,7 @@ def test_executable(): cmd=[sys.executable, execute_with_delay_command, '500', pendulum_teleop_executable, '100'], name=pendulum_teleop_name, exit_handler=ignore_exit_handler, - output_handlers=[pendulum_teleop_handler], + output_handlers=[pendulum_teleop_handler, ConsoleOutput()], ) launcher = DefaultLauncher() From e08d72803240358e21d84d816db5551e90e4bed8 Mon Sep 17 00:00:00 2001 From: dhood Date: Mon, 23 May 2016 18:15:31 -0700 Subject: [PATCH 3/3] Order imports alphabetically --- pendulum_control/test/test_pendulum_demo.py.in | 4 +++- pendulum_control/test/test_pendulum_teleop.py.in | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pendulum_control/test/test_pendulum_demo.py.in b/pendulum_control/test/test_pendulum_demo.py.in index 9b803ac42..4bbfaba17 100644 --- a/pendulum_control/test/test_pendulum_demo.py.in +++ b/pendulum_control/test/test_pendulum_demo.py.in @@ -1,8 +1,10 @@ import os + from launch import LaunchDescriptor from launch.exit_handler import ignore_exit_handler -from launch.output_handler import ConsoleOutput from launch.launcher import DefaultLauncher +from launch.output_handler import ConsoleOutput + from launch_testing import create_handler diff --git a/pendulum_control/test/test_pendulum_teleop.py.in b/pendulum_control/test/test_pendulum_teleop.py.in index 049874b2d..37c8c9443 100644 --- a/pendulum_control/test/test_pendulum_teleop.py.in +++ b/pendulum_control/test/test_pendulum_teleop.py.in @@ -3,8 +3,9 @@ import sys from launch import LaunchDescriptor from launch.exit_handler import ignore_exit_handler -from launch.output_handler import ConsoleOutput from launch.launcher import DefaultLauncher +from launch.output_handler import ConsoleOutput + from launch_testing import create_handler