diff --git a/cmd/prune-junit-xml/prunexml.go b/cmd/prune-junit-xml/prunexml.go index 3ad7b3a6425..f4a5421736b 100644 --- a/cmd/prune-junit-xml/prunexml.go +++ b/cmd/prune-junit-xml/prunexml.go @@ -19,6 +19,7 @@ package main import ( "encoding/xml" "flag" + "fmt" "io" "os" ) @@ -76,6 +77,7 @@ func main() { if flag.NArg() > 0 { for _, path := range flag.Args() { + fmt.Printf("processing junit xml file : %s\n", path) xmlReader, err := os.Open(path) if err != nil { panic(err) @@ -97,6 +99,7 @@ func main() { if err != nil { panic(err) } + fmt.Println("done.") } } } @@ -106,12 +109,14 @@ func pruneXML(suites *JUnitTestSuites, maxBytes int) { for _, testcase := range suite.TestCases { if testcase.SkipMessage != nil { if len(testcase.SkipMessage.Message) > maxBytes { + fmt.Printf("clipping skip message in test case : %s\n", testcase.Name) testcase.SkipMessage.Message = "[... clipped...]" + testcase.SkipMessage.Message[len(testcase.SkipMessage.Message)-maxBytes:] } } if testcase.Failure != nil { if len(testcase.Failure.Contents) > maxBytes { + fmt.Printf("clipping failure message in test case : %s\n", testcase.Name) testcase.Failure.Contents = "[... clipped...]" + testcase.Failure.Contents[len(testcase.Failure.Contents)-maxBytes:] } diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index 4c0015ebd62..33e8c311dc7 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -240,6 +240,14 @@ produceJUnitXMLReport() { rm "${junit_filename_prefix}"*.stdout fi + if ! command -v prune-junit-xml >/dev/null 2>&1; then + kube::log::status "prune-junit-xml not found; installing from hack/tools" + pushd "${KUBE_ROOT}/cmd/prune-junit-xml" >/dev/null + GO111MODULE=on go install . + popd >/dev/null + fi + prune-junit-xml "${junit_xml_filename}" + kube::log::status "Saved JUnit XML test report to ${junit_xml_filename}" }