From b1dabb661a63ed28c34ea5cbd3e49fa22b0e69c4 Mon Sep 17 00:00:00 2001 From: Katarzyna Lach Date: Mon, 6 Jun 2022 13:18:45 +0000 Subject: [PATCH] Fix last error logging in affinity tests --- cmd/e2e-test/affinity_beta_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/e2e-test/affinity_beta_test.go b/cmd/e2e-test/affinity_beta_test.go index ecd6ad0422..57237bf2cb 100644 --- a/cmd/e2e-test/affinity_beta_test.go +++ b/cmd/e2e-test/affinity_beta_test.go @@ -125,19 +125,19 @@ func TestAffinityBeta(t *testing.T) { }); err != nil { t.Errorf("CloudV1beta1().BackendConfigs(%q).Update(%#v) = %v, want nil", s.Namespace, transition, err) } - + var logicErr error if waitErr := wait.Poll(transitionPollInterval, transitionPollTimeout, func() (bool, error) { - gclb, err = fuzz.GCLBForVIP(context.Background(), Framework.Cloud, params) - if err != nil { - t.Logf("Error getting GCP resources for LB with IP(%q): %v", vip, err) + gclb, logicErr = fuzz.GCLBForVIP(context.Background(), Framework.Cloud, params) + if logicErr != nil { + t.Logf("Error getting GCP resources for LB with IP(%q): %v", vip, logicErr) return false, nil } - if err := verifyAffinity(t, gclb, s.Namespace, svcName, transition.affinity, transition.ttl); err != nil { + if logicErr = verifyAffinity(t, gclb, s.Namespace, svcName, transition.affinity, transition.ttl); logicErr != nil { return false, nil } return true, nil }); waitErr != nil { - t.Errorf("Error waiting for BackendConfig affinity transition propagation to GCLB, last seen error: %v", err) + t.Errorf("Error waiting for BackendConfig affinity transition propagation to GCLB, last seen error: %v", logicErr) } }) }