From 798e0dc70e6496cc1f48ce5223849cfe0f730db3 Mon Sep 17 00:00:00 2001 From: FengyunPan Date: Thu, 27 Apr 2017 19:50:20 +0800 Subject: [PATCH] [Federation]Fix e2e: pass clusterIngress out --- test/e2e_federation/ingress.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e_federation/ingress.go b/test/e2e_federation/ingress.go index 701dd2583f5..dcfeca7b466 100644 --- a/test/e2e_federation/ingress.go +++ b/test/e2e_federation/ingress.go @@ -323,7 +323,8 @@ func waitForIngressOrFail(clientset *kubeclientset.Clientset, namespace string, By(fmt.Sprintf("Fetching a federated ingress shard of ingress %q in namespace %q from cluster", ingress.Name, namespace)) var clusterIngress *v1beta1.Ingress err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { - clusterIngress, err := clientset.Ingresses(namespace).Get(ingress.Name, metav1.GetOptions{}) + var err error + clusterIngress, err = clientset.Ingresses(namespace).Get(ingress.Name, metav1.GetOptions{}) if (!present) && errors.IsNotFound(err) { // We want it gone, and it's gone. By(fmt.Sprintf("Success: shard of federated ingress %q in namespace %q in cluster is absent", ingress.Name, namespace)) return true, nil // Success