Merge pull request #47099 from mengqiy/add_junit_for_cmd_tests

Automatic merge from submit-queue (batch tested with PRs 47204, 46808, 47432, 47400, 47099) support junit in test-cmd Output junit result for cmd tests. Fixes #45196 There will be a followup PR to refactor the cmd test into functions as test cases there is not a lot changes in `hack/make-rules/test-cmd-util.sh` ```release-note NONE ```

Merge pull request #47099 from mengqiy/add_junit_for_cmd_tests
304106f0 · Kubernetes Submit Queue · GitHub · eb26aa55 · 590ea991 · 304106f0
Commit 304106f0 authored Jun 14, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

test-cmd-util.sh hack/make-rules/test-cmd-util.sh +0 -0

sh2ju.sh third_party/forked/shell2junit/sh2ju.sh +6 -5

No files found.
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
--- a/third_party/forked/shell2junit/sh2ju.sh
+++ b/third_party/forked/shell2junit/sh2ju.sh
@@ -137,11 +137,6 @@ function juLog() {
  content="$content
    <testcase assertions=\"1\" name=\"$name\" time=\"$time\" classname=\"$class\">
    $failure
-    <system-out>
-<![CDATA[
-$out
-]]>
-    </system-out>
    <system-err>
 <![CDATA[
 $errMsg
@@ -160,18 +155,24 @@ $errMsg

    # file exists. Need to append to it. If we remove the testsuite end tag, we can just add it in after.
    sed -i "s^</testsuite>^^g" $juDIR/junit-$suite.xml ## remove testSuite so we can add it later
+    sed -i "s^</testsuites>^^g" $juDIR/junit-$suite.xml
    cat <<EOF >> "$juDIR/junit-$suite.xml"
     $content
    </testsuite>
+</testsuites>
 EOF

  else
    # no file exists. Adding a new file
    cat <<EOF > "$juDIR/junit-$suite.xml"
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
    <testsuite failures="$errors" assertions="$assertions" name="$suite" tests="1" errors="$errors" time="$total">
    $content
    </testsuite>
+</testsuites>
 EOF
  fi

+  return $err
 }