github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 20:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12926 from smarterclayton/cleanup_graceful

Browse Source 
Cleanup more extensively in e2e (0/7)
This commit is contained in:
Zach Loafman
2015-08-20 10:25:15 -07:00
parent e072f56722 dcdbc646ed
commit 95a60d6085
9 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/pd.go
View File

@@ -190,7 +190,7 @@ var _ = Describe("Pod Disks", func() {
By("cleaning up PD-RW test environment")
// Teardown pods, PD. Ignore errors.
// Teardown should do nothing unless test failed.
podClient.Delete(host0Pod.Name, nil)
podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0))
detachPD(host0Name, diskName)
deletePD(diskName)
}()
@@ -221,7 +221,7 @@ var _ = Describe("Pod Disks", func() {
verifyPDContentsViaContainer(framework, host0Pod.Name, containerName, fileAndContentToVerify)
By("deleting host0Pod")
expectNoError(podClient.Delete(host0Pod.Name, nil), "Failed to delete host0Pod")
expectNoError(podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)), "Failed to delete host0Pod")
}
By(fmt.Sprintf("deleting PD %q", diskName))