Merge pull request #37394 from nikhiljindal/deploymentE2e

Automatic merge from submit-queue Fixing a typo in deployment e2e Ref https://github.com/kubernetes/kubernetes/issues/37105 and https://github.com/kubernetes/kubernetes/issues/37143. Fixing the failing deployment e2e. There are 3 deployment cases failing right now. https://github.com/kubernetes/kubernetes/pull/37290 fixes the first and this PR fixes the other 2. cc @kubernetes/sig-cluster-federation @madhusudancs @mwielgus

Merge pull request #37394 from nikhiljindal/deploymentE2e
56836cac · Kubernetes Submit Queue · GitHub · 448dfc7b · 3cfbe6af · 56836cac
Commit 56836cac authored Nov 28, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

federation-deployment.go test/e2e/federation-deployment.go +1 -1

No files found.
--- a/test/e2e/federation-deployment.go
+++ b/test/e2e/federation-deployment.go
@@ -179,7 +179,7 @@ func verifyCascadingDeletionForDeployment(clientset *fedclientset.Clientset, clu
 		_, err := clusterClientset.Extensions().Deployments(nsName).Get(deploymentName)
 		if shouldExist && errors.IsNotFound(err) {
 			errMessages = append(errMessages, fmt.Sprintf("unexpected NotFound error for deployment %s in cluster %s, expected deployment to exist", deploymentName, clusterName))
-		} else if shouldExist && !errors.IsNotFound(err) {
+		} else if !shouldExist && !errors.IsNotFound(err) {
 			errMessages = append(errMessages, fmt.Sprintf("expected NotFound error for deployment %s in cluster %s, got error: %v", deploymentName, clusterName, err))
 		}
 	}