github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "improve e2e retry logic with standard wait.Poll()"

Browse Source
This commit is contained in:
Quinton Hoole
2015-05-19 11:17:32 -07:00
parent b963307496
commit 14665119b4
10 changed files with 119 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/pd.go
View File

@@ -29,8 +29,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@@ -110,14 +108,14 @@ var _ = Describe("PD", func() {
expectNoError(podClient.Delete(host1Pod.Name, nil), "Failed to delete host1Pod")
By(fmt.Sprintf("deleting PD %q", diskName))
expectNoError(wait.Poll(5*time.Second, 180*time.Second, func() (bool, error) {
for start := time.Now(); time.Since(start) < 180*time.Second; time.Sleep(5 * time.Second) {
if err = deletePD(diskName); err != nil {
Logf("Couldn't delete PD. Sleeping 5 seconds (%v)", err)
return false, nil
continue
}
Logf("Deleted PD %v", diskName)
return true, nil
}))
break
}
expectNoError(err, "Error deleting PD")
return
@@ -178,14 +176,13 @@ var _ = Describe("PD", func() {
expectNoError(podClient.Delete(host1ROPod.Name, nil), "Failed to delete host1ROPod")
By(fmt.Sprintf("deleting PD %q", diskName))
expectNoError(wait.Poll(5*time.Second, 180*time.Second, func() (bool, error) {
for start := time.Now(); time.Since(start) < 180*time.Second; time.Sleep(5 * time.Second) {
if err = deletePD(diskName); err != nil {
Logf("Couldn't delete PD. Sleeping 5 seconds")
return false, nil
continue
}
return true, nil
}))
break
}
expectNoError(err, "Error deleting PD")
})
})