Merge pull request #2909 from panslava/fix-error-log-in-test

k8s-ci-robot · web-flow · commit 1e57aca9c860 · 2025-06-18T18:14:52.000-07:00
Fix shadowing error in tests
diff --git a/cmd/e2e-test/logging_test.go b/cmd/e2e-test/logging_test.go
@@ -170,9 +170,11 @@ func TestLogging(t *testing.T) {
 				gclb, err = fuzz.GCLBForVIP(context.Background(), Framework.Cloud, params)
 				if err != nil {
 					t.Logf("Failed to GCP resources for LB with IP = %q: %v", vip, err)
+					err = fmt.Errorf("failed to GCP resources for LB with IP = %q: %v", vip, err)
 					return false, nil
 				}
-				if err := verifyLogging(t, gclb, s.Namespace, svcName, tc.transition); err != nil {
+				if err = verifyLogging(t, gclb, s.Namespace, svcName, tc.transition); err != nil {
+					err = fmt.Errorf("failed to verify logging for LB with IP = %q: %v", vip, err)
 					return false, nil
 				}
 				return true, nil

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,11 @@ func TestLogging(t *testing.T) {`
`170`	`170`	`gclb, err = fuzz.GCLBForVIP(context.Background(), Framework.Cloud, params)`
`171`	`171`	`if err != nil {`
`172`	`172`	`t.Logf("Failed to GCP resources for LB with IP = %q: %v", vip, err)`
	`173`	`+ err = fmt.Errorf("failed to GCP resources for LB with IP = %q: %v", vip, err)`
`173`	`174`	`return false, nil`
`174`	`175`	`}`
`175`		`- if err := verifyLogging(t, gclb, s.Namespace, svcName, tc.transition); err != nil {`
	`176`	`+ if err = verifyLogging(t, gclb, s.Namespace, svcName, tc.transition); err != nil {`
	`177`	`+ err = fmt.Errorf("failed to verify logging for LB with IP = %q: %v", vip, err)`
`176`	`178`	`return false, nil`
`177`	`179`	`}`
`178`	`180`	`return true, nil`