Skip to content

Commit

Permalink
Merge pull request kubernetes#40926 from shashidharatd/fed-e2e-2
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 41112, 41201, 41058, 40650, 40926)

[Federation][e2e] Fix few flakes in federation e2e tests

**What this PR does / why we need it**:
Fixes few flakes in kubernetes#37105

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # partly fixes few test cases in the above  mentioned issue.

**Special notes for your reviewer**:
While cleaning up in AfterEach Block some objects are returned while listing, but by the time the object is delete is issued the object is disappearing resulting in this flake occasionally.
To fix this, we need to check if the err is NotFound while deleting, its ok and need not fail the test.

**Release note**: `NONE`

```release-note
```
  • Loading branch information
Kubernetes Submit Queue authored Feb 10, 2017
2 parents 651bb05 + f4d798f commit b31cf72
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
4 changes: 3 additions & 1 deletion test/e2e_federation/federated-daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,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) {
Expand Down
4 changes: 3 additions & 1 deletion test/e2e_federation/federated-deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,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) {
Expand Down
4 changes: 3 additions & 1 deletion test/e2e_federation/federated-replicaset.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,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) {
Expand Down
4 changes: 3 additions & 1 deletion test/e2e_federation/federated-secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,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) {
Expand Down

0 comments on commit b31cf72

Please sign in to comment.