Fix few flakes in federation e2e tests

gitpypy · Feb 3, 2017 · f4d798f · f4d798f
1 parent ab794c6
commit f4d798f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/test/e2e_federation/federated-daemonset.go b/test/e2e_federation/federated-daemonset.go
@@ -192,7 +192,9 @@ func createDaemonSetOrFail(clientset *fedclientset.Clientset, namespace string)
 func deleteDaemonSetOrFail(clientset *fedclientset.Clientset, nsName string, daemonsetName string, orphanDependents *bool) {
 	By(fmt.Sprintf("Deleting daemonset %q in namespace %q", daemonsetName, nsName))
 	err := clientset.Extensions().DaemonSets(nsName).Delete(daemonsetName, &metav1.DeleteOptions{OrphanDependents: orphanDependents})
-	framework.ExpectNoError(err, "Error deleting daemonset %q in namespace %q", daemonsetName, nsName)
+	if err != nil && !errors.IsNotFound(err) {
+		framework.ExpectNoError(err, "Error deleting daemonset %q in namespace %q", daemonsetName, nsName)
+	}
 
 	// Wait for the daemonset to be deleted.
 	err = wait.Poll(5*time.Second, wait.ForeverTestTimeout, func() (bool, error) {

diff --git a/test/e2e_federation/federated-deployment.go b/test/e2e_federation/federated-deployment.go
@@ -262,7 +262,9 @@ func updateDeploymentOrFail(clientset *fedclientset.Clientset, namespace string)
 func deleteDeploymentOrFail(clientset *fedclientset.Clientset, nsName string, deploymentName string, orphanDependents *bool) {
 	By(fmt.Sprintf("Deleting deployment %q in namespace %q", deploymentName, nsName))
 	err := clientset.Extensions().Deployments(nsName).Delete(deploymentName, &metav1.DeleteOptions{OrphanDependents: orphanDependents})
-	framework.ExpectNoError(err, "Error deleting deployment %q in namespace %q", deploymentName, nsName)
+	if err != nil && !errors.IsNotFound(err) {
+		framework.ExpectNoError(err, "Error deleting deployment %q in namespace %q", deploymentName, nsName)
+	}
 
 	// Wait for the deployment to be deleted.
 	err = wait.Poll(5*time.Second, wait.ForeverTestTimeout, func() (bool, error) {

diff --git a/test/e2e_federation/federated-replicaset.go b/test/e2e_federation/federated-replicaset.go
@@ -248,7 +248,9 @@ func createReplicaSetOrFail(clientset *fedclientset.Clientset, namespace string)
 func deleteReplicaSetOrFail(clientset *fedclientset.Clientset, nsName string, replicaSetName string, orphanDependents *bool) {
 	By(fmt.Sprintf("Deleting replica set %q in namespace %q", replicaSetName, nsName))
 	err := clientset.Extensions().ReplicaSets(nsName).Delete(replicaSetName, &metav1.DeleteOptions{OrphanDependents: orphanDependents})
-	framework.ExpectNoError(err, "Error deleting replica set %q in namespace %q", replicaSetName, nsName)
+	if err != nil && !errors.IsNotFound(err) {
+		framework.ExpectNoError(err, "Error deleting replica set %q in namespace %q", replicaSetName, nsName)
+	}
 
 	// Wait for the replicaSet to be deleted.
 	err = wait.Poll(5*time.Second, wait.ForeverTestTimeout, func() (bool, error) {

diff --git a/test/e2e_federation/federated-secret.go b/test/e2e_federation/federated-secret.go
@@ -171,7 +171,9 @@ func createSecretOrFail(clientset *fedclientset.Clientset, nsName string) *v1.Se
 func deleteSecretOrFail(clientset *fedclientset.Clientset, nsName string, secretName string, orphanDependents *bool) {
 	By(fmt.Sprintf("Deleting secret %q in namespace %q", secretName, nsName))
 	err := clientset.Core().Secrets(nsName).Delete(secretName, &metav1.DeleteOptions{OrphanDependents: orphanDependents})
-	framework.ExpectNoError(err, "Error deleting secret %q in namespace %q", secretName, nsName)
+	if err != nil && !errors.IsNotFound(err) {
+		framework.ExpectNoError(err, "Error deleting secret %q in namespace %q", secretName, nsName)
+	}
 
 	// Wait for the secret to be deleted.
 	err = wait.Poll(5*time.Second, wait.ForeverTestTimeout, func() (bool, error) {