From 6e13696d53fb75c933e7fe8b49b24822b5389f06 Mon Sep 17 00:00:00 2001 From: FengyunPan Date: Fri, 28 Apr 2017 10:13:13 +0800 Subject: [PATCH] [federation][e2e] Distinguish local vars and global vars --- test/e2e_federation/daemonset.go | 3 ++- test/e2e_federation/secret.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e_federation/daemonset.go b/test/e2e_federation/daemonset.go index aa373a2a92..b46866b893 100644 --- a/test/e2e_federation/daemonset.go +++ b/test/e2e_federation/daemonset.go @@ -245,7 +245,8 @@ func waitForDaemonSetOrFail(clientset *kubeclientset.Clientset, namespace string By(fmt.Sprintf("Fetching a federated daemonset shard of daemonset %q in namespace %q from cluster", daemonset.Name, namespace)) var clusterDaemonSet *v1beta1.DaemonSet err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { - clusterDaemonSet, err := clientset.Extensions().DaemonSets(namespace).Get(daemonset.Name, metav1.GetOptions{}) + var err error + clusterDaemonSet, err = clientset.Extensions().DaemonSets(namespace).Get(daemonset.Name, metav1.GetOptions{}) if (!present) && errors.IsNotFound(err) { // We want it gone, and it's gone. By(fmt.Sprintf("Success: shard of federated daemonset %q in namespace %q in cluster is absent", daemonset.Name, namespace)) return true, nil // Success diff --git a/test/e2e_federation/secret.go b/test/e2e_federation/secret.go index 40e8c41483..c6ab388d70 100644 --- a/test/e2e_federation/secret.go +++ b/test/e2e_federation/secret.go @@ -225,7 +225,8 @@ func waitForSecretOrFail(clientset *kubeclientset.Clientset, nsName string, secr By(fmt.Sprintf("Fetching a federated secret shard of secret %q in namespace %q from cluster", secret.Name, nsName)) var clusterSecret *v1.Secret err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { - clusterSecret, err := clientset.Core().Secrets(nsName).Get(secret.Name, metav1.GetOptions{}) + var err error + clusterSecret, err = clientset.Core().Secrets(nsName).Get(secret.Name, metav1.GetOptions{}) if (!present) && errors.IsNotFound(err) { // We want it gone, and it's gone. By(fmt.Sprintf("Success: shard of federated secret %q in namespace %q in cluster is absent", secret.Name, nsName)) return true, nil // Success