github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #39096 from caesarxuchao/fix-gc-e2e-test 

Automatic merge from submit-queue

e2e test should fail if err==timeout

If err==timeout, it means the replicaset (the owner) is not deleted after 30s, which indicates a bug, so the e2e test should fail.
pull/6/head
Kubernetes Submit Queue 2017-01-31 08:44:35 -08:00 committed by GitHub
parent a2b65f03bf 73b5dbcd9b
commit de2493e733
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/garbage_collector.go
View File

@ -263,7 +263,7 @@ var _ = framework.KubeDescribe("Garbage collector", func() {
return false, nil
}
return true, nil
}); err != nil && err != wait.ErrWaitTimeout {
}); err != nil {
framework.Failf("%v", err)
}
By("wait for 30 seconds to see if the garbage collector mistakenly deletes the pods")