format xml output

Author: mattfenwick

pkg/connectivity/junit.go

@@ -30,6 +30,7 @@ func PrintJUnitResults(filename string, summary *Summary) {
 func printJunit(w io.Writer, summary *Summary) error {
 	s := summaryToJunit(summary)
 	enc := xml.NewEncoder(w)
+	enc.Indent("", "    ")
 	return enc.Encode(s)
 }
 

pkg/connectivity/result.go

@@ -31,6 +31,15 @@ func (r *Result) Features() map[string][]string {
 	return r.TestCase.GetFeatures()
 }
 
+func (r *Result) Passed(ignoreLoopback bool) bool {
+	for _, step := range r.Steps {
+		if step.LastComparison().ValueCounts(ignoreLoopback)[DifferentComparison] > 0 {
+			return false
+		}
+	}
+	return true
+}
+
 type CombinedResults struct {
 	Results []*Result
 }
@@ -60,13 +69,7 @@ func (c *CombinedResults) Summary(ignoreLoopback bool) *Summary {
 	passedTotal, failedTotal := 0, 0
 
 	for testNumber, result := range c.Results {
-		// preprocess to figure out whether it passed or failed
-		passed := true
-		for _, step := range result.Steps {
-			if step.LastComparison().ValueCounts(ignoreLoopback)[DifferentComparison] > 0 {
-				passed = false
-			}
-		}
+		passed := result.Passed(ignoreLoopback)
 
 		for primary, subs := range result.Features() {
 			if _, ok := summary.FeatureCounts[primary]; !ok {

pkg/connectivity/testdata/2-pass-2-fail.golden.xml

@@ -1 +1,11 @@
-<testsuite tests="0" failures="0" time="" name="cyclonus"><properties></properties><testcase classname="" name="test1" time=""></testcase><testcase classname="" name="test2 with spaces" time=""><failure message="" type=""></failure></testcase><testcase classname="" name="test3 with + special %chars/" time=""></testcase><testcase classname="" name="test4 with&#xA;newlines" time=""><failure message="" type=""></failure></testcase></testsuite>
+<testsuite tests="0" failures="0" time="" name="cyclonus">
+    <properties></properties>
+    <testcase classname="" name="test1" time=""></testcase>
+    <testcase classname="" name="test2 with spaces" time="">
+        <failure message="" type=""></failure>
+    </testcase>
+    <testcase classname="" name="test3 with + special %chars/" time=""></testcase>
+    <testcase classname="" name="test4 with&#xA;newlines" time="">
+        <failure message="" type=""></failure>
+    </testcase>
+</testsuite>

pkg/connectivity/testdata/empty-summary.golden.xml

@@ -1 +1,3 @@
-<testsuite tests="0" failures="0" time="" name="cyclonus"><properties></properties></testsuite>
+<testsuite tests="0" failures="0" time="" name="cyclonus">
+    <properties></properties>
+</testsuite>

pkg/connectivity/testdata/use-summary-failure-count.golden.xml

@@ -1 +1,3 @@
-<testsuite tests="0" failures="10" time="" name="cyclonus"><properties></properties></testsuite>
+<testsuite tests="0" failures="10" time="" name="cyclonus">
+    <properties></properties>
+</testsuite>