From ade055f3b53324099826b86e419baf1054cbf198 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Fri, 30 Sep 2016 11:54:39 -0700 Subject: [PATCH 1/2] Explicitly return nil for underlying cluster's service in Federated Service e2e cleanup function. --- test/e2e/federation-util.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/federation-util.go b/test/e2e/federation-util.go index d39e764b3a7..881fdd5d88e 100644 --- a/test/e2e/federation-util.go +++ b/test/e2e/federation-util.go @@ -300,6 +300,10 @@ func cleanupServiceShardsAndProviderResources(namespace string, service *v1.Serv // Get failed with an error, try again. framework.Logf("Failed to find service %q in namespace %q, in cluster %q: %v. Trying again in %s", service.Name, namespace, name, err, framework.Poll) return false, nil + } else if errors.IsNotFound(err) { + cSvc = nil + By(fmt.Sprintf("Service %q in namespace %q in cluster %q not found", service.Name, namespace, name)) + return true, nil } By(fmt.Sprintf("Service %q in namespace %q in cluster %q found", service.Name, namespace, name)) return true, nil @@ -307,7 +311,7 @@ func cleanupServiceShardsAndProviderResources(namespace string, service *v1.Serv if err != nil || cSvc == nil { By(fmt.Sprintf("Failed to find service %q in namespace %q, in cluster %q in %s", service.Name, namespace, name, FederatedServiceTimeout)) - return + continue } err = cleanupServiceShard(c.Clientset, name, namespace, cSvc, FederatedServiceTimeout) From 84dc0a3e092b8f2b78b3958e09a4619bafa8d386 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Fri, 30 Sep 2016 15:13:02 -0700 Subject: [PATCH 2/2] Address review comment. --- test/e2e/federation-util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/federation-util.go b/test/e2e/federation-util.go index 881fdd5d88e..5ed643871f9 100644 --- a/test/e2e/federation-util.go +++ b/test/e2e/federation-util.go @@ -303,10 +303,10 @@ func cleanupServiceShardsAndProviderResources(namespace string, service *v1.Serv } else if errors.IsNotFound(err) { cSvc = nil By(fmt.Sprintf("Service %q in namespace %q in cluster %q not found", service.Name, namespace, name)) - return true, nil + return true, err } By(fmt.Sprintf("Service %q in namespace %q in cluster %q found", service.Name, namespace, name)) - return true, nil + return true, err }) if err != nil || cSvc == nil {