Merge pull request #1196 from freehan/junitfix

fix junit xml with testsuites tag

Author: lavalamp

mungegithub/mungers/e2e/e2e.go

@@ -30,6 +30,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/sets"
 
 	"github.com/golang/glog"
+	"io/ioutil"
 )
 
 // E2ETester can be queried for E2E job stability.
@@ -254,21 +255,37 @@ func getJUnitFailures(r io.Reader) (failures map[string]string, err error) {
 		FailCount int        `xml:"failures,attr"`
 		Testcases []Testcase `xml:"testcase"`
 	}
-	ts := &Testsuite{}
-	// TODO: this full parse is a bit slower than the old scanf routine--
-	// could switch back for the case where we only care whether there was
-	// a failure or not if that is an issue in practice.
-	err = xml.NewDecoder(r).Decode(ts)
+	type Testsuites struct {
+		TestSuites []Testsuite `xml:"testsuite"`
+	}
+	var testSuiteList []Testsuite
+	failures = map[string]string{}
+	testSuites := &Testsuites{}
+	testSuite := &Testsuite{}
+	b, err := ioutil.ReadAll(r)
 	if err != nil {
 		return failures, err
 	}
-	if ts.FailCount == 0 {
-		return nil, nil
+	// first try to parse the result with <testsuites> as top tag
+	err = xml.Unmarshal(b, testSuites)
+	if err == nil && len(testSuites.TestSuites) > 0 {
+		testSuiteList = testSuites.TestSuites
+	} else {
+		// second try to parse the result with <testsuite> as top tag
+		err = xml.Unmarshal(b, testSuite)
+		if err != nil {
+			return nil, err
+		}
+		testSuiteList = []Testsuite{*testSuite}
 	}
-	failures = map[string]string{}
-	for _, tc := range ts.Testcases {
-		if tc.Failure != "" {
-			failures[fmt.Sprintf("%v {%v}", tc.Name, tc.ClassName)] = tc.Failure
+	for _, ts := range testSuiteList {
+		if ts.FailCount == 0 {
+			continue
+		}
+		for _, tc := range ts.Testcases {
+			if tc.Failure != "" {
+				failures[fmt.Sprintf("%v {%v}", tc.Name, tc.ClassName)] = tc.Failure
+			}
 		}
 	}
 	return failures, nil

mungegithub/mungers/e2e/e2e_test.go

@@ -388,6 +388,29 @@ func getRealJUnitFailure() []byte {
 </testsuite>`)
 }
 
+func getRealJUnitFailureWithTestSuitesTag() []byte {
+	return []byte(`<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+	<testsuite tests="52" failures="2" time="374.434" name="k8s.io/kubernetes/test/integration">
+		<properties>
+			<property name="go.version" value="go1.6.2"></property>
+		</properties>
+		<testcase classname="integration" name="TestMasterProcessMetrics" time="0.070"></testcase>
+		<testcase classname="integration" name="TestApiserverMetrics" time="0.070"></testcase>
+		<testcase classname="integration" name="TestMasterExportsSymbols" time="0.000"></testcase>
+		<testcase classname="integration" name="TestPersistentVolumeRecycler" time="20.460"></testcase>
+		<testcase classname="integration" name="TestPersistentVolumeMultiPVs" time="10.240">
+			<failure message="Failed" type="">persistent_volumes_test.go:254: volumes created&#xA;persistent_volumes_test.go:260: claim created&#xA;persistent_volumes_test.go:264: volume bound&#xA;persistent_volumes_test.go:266: claim bound&#xA;persistent_volumes_test.go:284: Bind mismatch! Expected pvc-2 capacity 50000000000 but got fake-pvc-72 capacity 5000000000</failure>
+		</testcase>
+		<testcase classname="integration" name="TestPersistentVolumeMultiPVsPVCs" time="3.370">
+			<failure message="Failed" type="">persistent_volumes_test.go:379: PVC &#34;pvc-0&#34; is not bound</failure>
+		</testcase>
+		<testcase classname="integration" name="TestPersistentVolumeMultiPVsDiffAccessModes" time="10.110"></testcase>
+	</testsuite>
+</testsuites>
+`)
+}
+
 func TestCheckGCSWeakBuilds(t *testing.T) {
 	latestBuildNumberFoo := 42
 	latestBuildNumberBar := 44
@@ -585,6 +608,7 @@ func TestCheckGCSWeakBuilds(t *testing.T) {
 }
 
 func TestJUnitFailureParse(t *testing.T) {
+	//parse junit xml result with <testsuite> as top tag
 	junitFailReader := bytes.NewReader(getRealJUnitFailure())
 	got, err := getJUnitFailures(junitFailReader)
 	if err != nil {
@@ -597,4 +621,17 @@ func TestJUnitFailureParse(t *testing.T) {
 	}, got; !reflect.DeepEqual(e, a) {
 		t.Errorf("Expected %v, got %v", e, a)
 	}
+
+	//parse junit xml result with <testsuites> as top tag
+	junitFailReader = bytes.NewReader(getRealJUnitFailureWithTestSuitesTag())
+	got, err = getJUnitFailures(junitFailReader)
+	if err != nil {
+		t.Fatalf("Parse error? %v", err)
+	}
+	if e, a := map[string]string{
+		"TestPersistentVolumeMultiPVs {integration}":     "persistent_volumes_test.go:254: volumes created&#xA;persistent_volumes_test.go:260: claim created&#xA;persistent_volumes_test.go:264: volume bound&#xA;persistent_volumes_test.go:266: claim bound&#xA;persistent_volumes_test.go:284: Bind mismatch! Expected pvc-2 capacity 50000000000 but got fake-pvc-72 capacity 5000000000",
+		"TestPersistentVolumeMultiPVsPVCs {integration}": "persistent_volumes_test.go:379: PVC &#34;pvc-0&#34; is not bound",
+	}, got; reflect.DeepEqual(e, a) {
+		t.Errorf("Expected %v, got %v", e, a)
+	}
 }