Rebase ament#587 on ament#598 and enable mixed msg/python tests

Signed-off-by: R Kent James <[email protected]>

Author: rkent

ament_cmake_python_test/test/ament_python_test_package/__init__.py

@@ -17,7 +17,7 @@
 # Set True to generate both a python package and a msg package for each python package
 # This is useful to test that python and msg packages can coexist in the same package
 # See issue #514 and PR #587
-COMBINE_PYTHON_WITH_MSG = False
+COMBINE_PYTHON_WITH_MSG = True
 
 # Set True to test ordering sensitivity of python and msg generation in CMakeLists.txt
 TEST_ORDERING_SENSITIVITY = False

ament_cmake_python_test/test/ament_python_test_package/main.py

@@ -14,8 +14,7 @@
 #
 """Test of ament_python_install_package."""
 
-# Not used until PR #587
-# import filecmp
+import filecmp
 import multiprocessing as mp
 import os
 from pathlib import Path
@@ -229,7 +228,6 @@ def test_from_options(module_dir):
     pool.terminate()
 
 
-'''Disable tests until PR #587 is merged
 def test_ament_python_test_package(module_dir) -> None:
     """Test installing a known package and comparing to the source files."""
     do_build_package(AMENT_PYTHON_TEST_PACKAGE, SOURCE_DIR / 'test' / 'packages', module_dir)
@@ -290,4 +288,3 @@ def test_python_double_version(module_dir) -> None:
         egg_info_file = egg_info_dir / 'PKG-INFO'
         assert Path.read_text(egg_info_file).find(f'Version: {version}') != -1, \
             f'egg-info file should contain "Version: {version}"'
-'''