Merge pull request #114954 from liggitt/head-prune

Include head and tail of clipped test messages
This commit is contained in:
Kubernetes Prow Robot 2023-01-10 12:05:25 -08:00 committed by GitHub
commit d4faca5386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions

View File

@ -65,15 +65,17 @@ func pruneXML(suites *junitxml.JUnitTestSuites, maxBytes int) {
if testcase.SkipMessage != nil { if testcase.SkipMessage != nil {
if len(testcase.SkipMessage.Message) > maxBytes { if len(testcase.SkipMessage.Message) > maxBytes {
fmt.Printf("clipping skip message in test case : %s\n", testcase.Name) fmt.Printf("clipping skip message in test case : %s\n", testcase.Name)
testcase.SkipMessage.Message = "[... clipped...]" + head := testcase.SkipMessage.Message[:maxBytes/2]
testcase.SkipMessage.Message[len(testcase.SkipMessage.Message)-maxBytes:] tail := testcase.SkipMessage.Message[len(testcase.SkipMessage.Message)-maxBytes/2:]
testcase.SkipMessage.Message = head + "[...clipped...]" + tail
} }
} }
if testcase.Failure != nil { if testcase.Failure != nil {
if len(testcase.Failure.Contents) > maxBytes { if len(testcase.Failure.Contents) > maxBytes {
fmt.Printf("clipping failure message in test case : %s\n", testcase.Name) fmt.Printf("clipping failure message in test case : %s\n", testcase.Name)
testcase.Failure.Contents = "[... clipped...]" + head := testcase.Failure.Contents[:maxBytes/2]
testcase.Failure.Contents[len(testcase.Failure.Contents)-maxBytes:] tail := testcase.Failure.Contents[len(testcase.Failure.Contents)-maxBytes/2:]
testcase.Failure.Contents = head + "[...clipped...]" + tail
} }
} }
} }

View File

@ -19,9 +19,10 @@ package main
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"github.com/stretchr/testify/assert"
"strings" "strings"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func TestPruneXML(t *testing.T) { func TestPruneXML(t *testing.T) {
@ -49,10 +50,10 @@ func TestPruneXML(t *testing.T) {
</properties> </properties>
<testcase classname="k8s.io/kubernetes/test/integration/apimachinery" name="TestWatchRestartsIfTimeoutNotReached/group/InformerWatcher_survives_closed_watches" time="30.050000"></testcase> <testcase classname="k8s.io/kubernetes/test/integration/apimachinery" name="TestWatchRestartsIfTimeoutNotReached/group/InformerWatcher_survives_closed_watches" time="30.050000"></testcase>
<testcase classname="k8s.io/kubernetes/test/integration/apiserver" name="TestMaxResourceSize/JSONPatchType_should_handle_a_patch_just_under_the_max_limit" time="0.000000"> <testcase classname="k8s.io/kubernetes/test/integration/apiserver" name="TestMaxResourceSize/JSONPatchType_should_handle_a_patch_just_under_the_max_limit" time="0.000000">
<skipped message="[... clipped...]ust_under_the_max_limit (0.00s)&#xA;"></skipped> <skipped message="=== RUN TestMa[...clipped...]x_limit (0.00s)&#xA;"></skipped>
</testcase> </testcase>
<testcase classname="k8s.io/kubernetes/test/integration/apimachinery" name="TestSchedulerInformers" time="-0.000000"> <testcase classname="k8s.io/kubernetes/test/integration/apimachinery" name="TestSchedulerInformers" time="-0.000000">
<failure message="Failed" type="">[... clipped...]prometheus/client_metrics.go:160</failure> <failure message="Failed" type="">&#xA;&#x9;/home/prow/go/[...clipped...]t_metrics.go:160</failure>
</testcase> </testcase>
</testsuite> </testsuite>
</testsuites>` </testsuites>`