github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87471 from lavalamp/you-must-wait

Browse Source 
don't wait blindly
This commit is contained in:
Kubernetes Prow Robot 2020-01-22 20:37:59 -08:00 committed by GitHub
commit 50fa183d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/apimachinery/garbage_collector.go
View File

@ -574,8 +574,18 @@ var _ = SIGDescribe("Garbage collector", func() {
if err := deployClient.Delete(deployment.ObjectMeta.Name, deleteOptions); err != nil { if err := deployClient.Delete(deployment.ObjectMeta.Name, deleteOptions); err != nil {
framework.Failf("failed to delete the deployment: %v", err) framework.Failf("failed to delete the deployment: %v", err)
} }
ginkgo.By("wait for 30 seconds to see if the garbage collector mistakenly deletes the rs") ginkgo.By("wait for deployment deletion to see if the garbage collector mistakenly deletes the rs")
time.Sleep(30 * time.Second) err = wait.PollImmediate(500*time.Millisecond, 1*time.Minute, func() (bool, error) {
dList, err := deployClient.List(metav1.ListOptions{})
if err != nil {
return false, fmt.Errorf("failed to list deployments: %v", err)
}
return len(dList.Items) == 0, nil
})
if err != nil {
framework.Failf("Failed to wait for the Deployment to be deleted: %v", err)
}
// Once the deployment object is gone, we'll know the GC has finished performing any relevant actions.
objects := map[string]int{"Deployments": 0, "ReplicaSets": 1, "Pods": 2} objects := map[string]int{"Deployments": 0, "ReplicaSets": 1, "Pods": 2}
ok, err := verifyRemainingObjects(f, objects) ok, err := verifyRemainingObjects(f, objects)
if err != nil { if err != nil {