Fixup

ros2 · Nov 28, 2017 · d6a0b66 · d6a0b66
1 parent 0ab6b7f
commit d6a0b66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/logging_demo/CMakeLists.txt b/logging_demo/CMakeLists.txt
@@ -13,7 +13,6 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 find_package(ament_index_cpp REQUIRED)
-find_package(composition REQUIRED)
 find_package(class_loader REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(rcutils REQUIRED)
@@ -55,13 +54,6 @@ target_link_libraries(logging_demo_main
 ament_target_dependencies(logging_demo_main
   "rclcpp")
 
-# since the package installs libraries without exporting them
-# it needs to make sure that the library path is being exported
-if(NOT WIN32)
-  ament_environment_hooks(
-    "${ament_cmake_package_templates_ENVIRONMENT_HOOK_LIBRARY_PATH}")
-endif()
-
 install(TARGETS
   logger_config_component
   logger_usage_component
@@ -100,14 +92,16 @@ if(BUILD_TESTING)
       TIMEOUT 20)
     list(
       APPEND generated_python_files
-      "${CMAKE_CURRENT_BINARY_DIR}/test_composition${target_suffix}_$<CONFIG>.py")
+      "${CMAKE_CURRENT_BINARY_DIR}/test_logging_demo${target_suffix}_$<CONFIG>.py")
   endmacro()
 
   call_for_each_rmw_implementation(tests)
 
   find_package(ament_cmake_flake8 REQUIRED)
   ament_flake8(
     TESTNAME "flake8_generated_launch"
+    # the generated code might contain longer lines if from a template
+    MAX_LINE_LENGTH 999
     ${generated_python_files})
 endif()
 

diff --git a/logging_demo/package.xml b/logging_demo/package.xml
@@ -14,12 +14,14 @@
   <build_depend>rclcpp</build_depend>
   <build_depend>rcutils</build_depend>
   <build_depend>rosidl_cmake</build_depend>
+  <build_depend>std_msgs</build_depend>
 
   <exec_depend>ament_index_cpp</exec_depend>
   <exec_depend>class_loader</exec_depend>
   <exec_depend>rclcpp</exec_depend>
   <exec_depend>rcutils</exec_depend>
   <exec_depend>rosidl_default_runtime</exec_depend>
+  <exec_depend>std_msgs</exec_depend>
 
   <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_auto</test_depend>

diff --git a/logging_demo/test/test_logging_demo.py.in b/logging_demo/test/test_logging_demo.py.in
@@ -14,7 +14,6 @@
 
 from launch import LaunchDescriptor
 from launch.exit_handler import default_exit_handler
-from launch.exit_handler import exit_on_error_exit_handler
 from launch.launcher import DefaultLauncher
 from launch.output_handler import ConsoleOutput
 from launch_testing import create_handler