fixes

Author: chrischdi

hack/ci-e2e-lib.sh

@@ -217,11 +217,14 @@ junit::createJunitReportE2Esh() {
   output_file="$2"
   status="failed"
   succeeded="false"
+  body="<system-out>hack/e2e.sh script succeeded</system-out>"
   if [[ "$failure" == 0 ]]; then
     status="passed"
     succeeded="true"
+    body="$(junit::createJunitReportE2EshFailureBody "${3}")"
   fi
   timestamp="$(date -u +%Y-%m-%dT%H:%M:%S)"
+
   # Write header
   cat > "$output_file" << EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -231,31 +234,24 @@ junit::createJunitReportE2Esh() {
           <property name="SuiteSucceeded" value="${succeeded}"/>
         </properties>
         <testcase name="hack_e2e_sh" classname="Preparation.hack_e2e_sh" status="${status}" time="0.1">
+${body}
+        </testcase>
+    </testsuite>
+</testsuites>
 EOF
-  # Write content
-  if [[ "$failure" == 0 ]]; then
-    # No error, just write a message to the output file.
-    echo "<system-out>hack/e2e.sh script succeeded</system-out>" >> "${output_file}"
-  else
-    failure_data_file="${3}"
-    cat >> "$output_file" << EOF
+}
+
+junit::createJunitReportE2EshFailureBody() {
+  failure_data_file="${1}"
+  cat << EOF
           <failure message="hack/e2e.sh script failed">
               <![CDATA[
 EOF
-    # Erorr case, write the content of the failure data file to the output file.
-    # Note: the sed ensures that the content does not close the CDATA section.
-    sed 's/]]>/]]>]]&gt;<![CDATA[/g' "${failure_data_file}" >> "$output_file" 
-
-    cat >> "$output_file" << EOF
+  # Erorr case, write the content of the failure data file to the output file.
+  # Note: the sed ensures that the content does not close the CDATA section.
+  sed 's/]]>/]]>]]&gt;<![CDATA[/g' "${failure_data_file}"
+  cat << EOF
             ]]>
           </failure>
 EOF
-  fi
-  # Write footer
-  cat >> "$output_file" << EOF
-        </testcase>
-    </testsuite>
-</testsuites>
-EOF
-
 }