From b1d0eae401565f81390ab82963fdc3415d9b6215 Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Mon, 27 Apr 2020 16:29:58 +0200
Subject: [PATCH 1/2] Use DEPRECATION instead of WARNING for package
 deprecation messages

This makes it possible to treat the warnings differently in downstream packages.
Refer to the CMake documentation for more info: https://cmake.org/cmake/help/v3.0/command/message.html

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
---
 ament_cmake_test/ament_cmake_test/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ament_cmake_test/ament_cmake_test/__init__.py b/ament_cmake_test/ament_cmake_test/__init__.py
index 95d5d9a4..b0f65f57 100644
--- a/ament_cmake_test/ament_cmake_test/__init__.py
+++ b/ament_cmake_test/ament_cmake_test/__init__.py
@@ -103,7 +103,7 @@ def main(argv=sys.argv[1:]):
     # in case the command segfaults or timeouts and does not generate one
     failure_result_file = _generate_result(
         args.result_file,
-        failure_message='The test did not generate a result file.')
+        error_message='The test did not generate a result file.')
     with open(args.result_file, 'w') as h:
         h.write(failure_result_file)
 
@@ -237,7 +237,7 @@ def log(msg, **kwargs):
             # regenerate result file to include output / exception of the invoked command
             failure_result_file = _generate_result(
                 args.result_file,
-                failure_message='The test did not generate a result file:\n\n' + output)
+                error_message='The test did not generate a result file:\n\n' + output)
             with open(args.result_file, 'w') as h:
                 h.write(failure_result_file)
         else:
@@ -293,7 +293,7 @@ def log(msg, **kwargs):
     return rc
 
 
-def _generate_result(result_file, *, failure_message=None, skip=False):
+def _generate_result(result_file, *, failure_message=None, skip=False, error_message=None):
     # the generated result file must be readable
     # by any of the Jenkins test result report publishers
     pkgname = os.path.basename(os.path.dirname(result_file))
@@ -304,17 +304,18 @@ def _generate_result(result_file, *, failure_message=None, skip=False):
         '<skipped type="skip" message="">![CDATA[Test Skipped by developer]]</skipped>' \
         if skip else ''
     return """<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="%s" tests="1" failures="%d" time="0" errors="0" skipped="%d">
+<testsuite name="%s" tests="1" failures="%d" time="0" errors="%d" skipped="%d">
   <testcase classname="%s" name="%s.missing_result" time="0">
-    %s%s
+    %s%s%s
   </testcase>
 </testsuite>\n""" % \
         (
             pkgname,
             1 if failure_message else 0,
+            1 if error_message else 0,
             1 if skip else 0,
             pkgname, testname,
-            failure_message, skipped_message
+            failure_message, skipped_message, error_message
         )
 
 

From e6276ef58b27d4fb661d6fbbb1ea1fff972adb7c Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Wed, 27 May 2020 23:04:57 +0200
Subject: [PATCH 2/2] Error message needs to be inside its own XML tag
 according to XSD

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
---
 ament_cmake_test/ament_cmake_test/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ament_cmake_test/ament_cmake_test/__init__.py b/ament_cmake_test/ament_cmake_test/__init__.py
index b0f65f57..9bd1715f 100644
--- a/ament_cmake_test/ament_cmake_test/__init__.py
+++ b/ament_cmake_test/ament_cmake_test/__init__.py
@@ -298,6 +298,8 @@ def _generate_result(result_file, *, failure_message=None, skip=False, error_mes
     # by any of the Jenkins test result report publishers
     pkgname = os.path.basename(os.path.dirname(result_file))
     testname = os.path.splitext(os.path.basename(result_file))[0]
+    error_message = '<error message=%s/>' % quoteattr(error_message) \
+        if error_message else ''
     failure_message = '<failure message=%s/>' % quoteattr(failure_message) \
         if failure_message else ''
     skipped_message = \