Merge pull request ros2#188 from ros2/ament_cmake_pytest

use ament_cmake_pytest instead of ament_cmake_nose

Author: dirk-thomas

composition/CMakeLists.txt

@@ -156,6 +156,7 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
+  find_package(ament_cmake_pytest REQUIRED)
   find_package(rmw_implementation_cmake REQUIRED)
 
   file(GENERATE
@@ -186,7 +187,7 @@ if(BUILD_TESTING)
     file(GENERATE
       OUTPUT test_composition${target_suffix}_$<CONFIG>.py
       INPUT test_composition${target_suffix}.py.genexp)
-    ament_add_nose_test(test_composition${target_suffix}
+    ament_add_pytest_test(test_composition${target_suffix}
       "${CMAKE_CURRENT_BINARY_DIR}/test_composition${target_suffix}_$<CONFIG>.py"
       ENV RMW_IMPLEMENTATION=${rmw_implementation}
       APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}/test_ament_index/$<CONFIG>

composition/package.xml

@@ -25,7 +25,7 @@
   <exec_depend>rosidl_default_runtime</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
-  <test_depend>ament_cmake_nose</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>launch</test_depend>

demo_nodes_cpp/CMakeLists.txt

@@ -62,6 +62,7 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
+  find_package(ament_cmake_pytest REQUIRED)
   find_package(rmw_implementation_cmake REQUIRED)
 
   # Add each test case.  Multi-executable tests can be specified in
@@ -105,7 +106,7 @@ if(BUILD_TESTING)
         INPUT "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}${target_suffix}.py.configured"
       )
 
-      ament_add_nose_test(test_tutorial_${exe_list_underscore}${target_suffix}
+      ament_add_pytest_test(test_tutorial_${exe_list_underscore}${target_suffix}
         "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}${target_suffix}_$<CONFIG>.py"
         TIMEOUT 30
         ENV

demo_nodes_cpp/package.xml

@@ -28,7 +28,7 @@
   <exec_depend>sensor_msgs</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
-  <test_depend>ament_cmake_nose</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>launch</test_depend>

demo_nodes_cpp_native/CMakeLists.txt

@@ -35,6 +35,8 @@ if(rmw_fastrtps_cpp_FOUND)
     find_package(ament_lint_auto REQUIRED)
     ament_lint_auto_find_test_dependencies()
 
+    find_package(ament_cmake_pytest REQUIRED)
+
     set(tutorial_executables "talker")
 
     set(DEMO_NODES_CPP_EXPECTED_OUTPUT "")
@@ -58,7 +60,7 @@ if(rmw_fastrtps_cpp_FOUND)
       INPUT "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}.py.configured"
     )
 
-    ament_add_nose_test(test_tutorial_${exe_list_underscore}
+    ament_add_pytest_test(test_tutorial_${exe_list_underscore}
       "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}_$<CONFIG>.py"
       TIMEOUT 30
       ENV

demo_nodes_cpp_native/package.xml

@@ -15,7 +15,7 @@
   <depend>rmw_fastrtps_cpp</depend>
   <depend>std_msgs</depend>
 
-  <test_depend>ament_cmake_nose</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>launch</test_depend>

image_tools/CMakeLists.txt

@@ -50,6 +50,7 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
+  find_package(ament_cmake_pytest REQUIRED)
   find_package(rmw_implementation_cmake REQUIRED)
 
   # These are the regex's for validating the output of the executables.
@@ -70,7 +71,7 @@ if(BUILD_TESTING)
       OUTPUT test_showimage_cam2image${target_suffix}_$<CONFIG>.py
       INPUT test_showimage_cam2image${target_suffix}.py.genexp)
 
-    ament_add_nose_test(test_showimage_cam2image${target_suffix}
+    ament_add_pytest_test(test_showimage_cam2image${target_suffix}
       "${CMAKE_CURRENT_BINARY_DIR}/test_showimage_cam2image${target_suffix}_$<CONFIG>.py"
       ENV
       RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}

image_tools/package.xml

@@ -18,7 +18,7 @@
   <exec_depend>sensor_msgs</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
-  <test_depend>ament_cmake_nose</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>launch</test_depend>

intra_process_demo/CMakeLists.txt

@@ -99,6 +99,7 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
+  find_package(ament_cmake_pytest REQUIRED)
   find_package(rmw_implementation_cmake REQUIRED)
 
   # Add each test case.  Multi-executable tests can be specified in
@@ -131,7 +132,7 @@ if(BUILD_TESTING)
         INPUT "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}${target_suffix}.py.configured"
       )
 
-      ament_add_nose_test(test_demo_${exe_list_underscore}${target_suffix}
+      ament_add_pytest_test(test_demo_${exe_list_underscore}${target_suffix}
         "${CMAKE_CURRENT_BINARY_DIR}/test_${exe_list_underscore}${target_suffix}_$<CONFIG>.py"
         TIMEOUT 30
         ENV

intra_process_demo/package.xml

@@ -18,7 +18,7 @@
   <exec_depend>rclcpp</exec_depend>
   <exec_depend>sensor_msgs</exec_depend>
 
-  <test_depend>ament_cmake_nose</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>launch</test_depend>