Merge pull request kubernetes#129155 from aojea/dns_panic

k8s-ci-robot · web-flow · commit 1e55df498583 · 2024-12-12T06:41:17.000Z
e2e: don't panic asserting inside wait.Poll
diff --git a/test/e2e/network/dns_common.go b/test/e2e/network/dns_common.go
@@ -490,7 +490,7 @@ func assertFilesContain(ctx context.Context, fileNames []string, fileDir string,
 
 			if err != nil {
 				if ctx.Err() != nil {
-					framework.Failf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
+					return false, fmt.Errorf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
 				} else {
 					framework.Logf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
 				}

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ func assertFilesContain(ctx context.Context, fileNames []string, fileDir string,`
`490`	`490`
`491`	`491`	`if err != nil {`
`492`	`492`	`if ctx.Err() != nil {`
`493`		`- framework.Failf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)`
	`493`	`+ return false, fmt.Errorf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)`
`494`	`494`	`} else {`
`495`	`495`	`framework.Logf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)`
`496`	`496`	`}`