From 100222ff310907476f5f9617d7bd89b7850a6dbd Mon Sep 17 00:00:00 2001 From: Huamin Chen Date: Fri, 10 Jun 2016 15:10:02 +0000 Subject: [PATCH] in each pd test, create and delete the pod for every iteration to give exec the unique pod name Signed-off-by: Huamin Chen --- test/e2e/pd.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/e2e/pd.go b/test/e2e/pd.go index d00863d962c..7f1b2a1a91c 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -176,14 +176,15 @@ var _ = framework.KubeDescribe("Pod Disks", func() { diskName, err := createPDWithRetry() framework.ExpectNoError(err, "Error creating PD") numContainers := 4 - - host0Pod := testPDPod([]string{diskName}, host0Name, false /* readOnly */, numContainers) + var host0Pod *api.Pod defer func() { By("cleaning up PD-RW test environment") // Teardown pods, PD. Ignore errors. // Teardown should do nothing unless test failed. - podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)) + if host0Pod != nil { + podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)) + } detachAndDeletePDs(diskName, []string{host0Name}) }() @@ -191,6 +192,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() { for i := 0; i < 3; i++ { framework.Logf("PD Read/Writer Iteration #%v", i) By("submitting host0Pod to kubernetes") + host0Pod = testPDPod([]string{diskName}, host0Name, false /* readOnly */, numContainers) _, err = podClient.Create(host0Pod) framework.ExpectNoError(err, fmt.Sprintf("Failed to create host0Pod: %v", err)) @@ -227,14 +229,15 @@ var _ = framework.KubeDescribe("Pod Disks", func() { By("creating PD2") disk2Name, err := createPDWithRetry() framework.ExpectNoError(err, "Error creating PD2") - - host0Pod := testPDPod([]string{disk1Name, disk2Name}, host0Name, false /* readOnly */, 1 /* numContainers */) + var host0Pod *api.Pod defer func() { By("cleaning up PD-RW test environment") // Teardown pods, PD. Ignore errors. // Teardown should do nothing unless test failed. - podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)) + if host0Pod != nil { + podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)) + } detachAndDeletePDs(disk1Name, []string{host0Name}) detachAndDeletePDs(disk2Name, []string{host0Name}) }() @@ -244,6 +247,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() { for i := 0; i < 3; i++ { framework.Logf("PD Read/Writer Iteration #%v", i) By("submitting host0Pod to kubernetes") + host0Pod = testPDPod([]string{disk1Name, disk2Name}, host0Name, false /* readOnly */, 1 /* numContainers */) _, err = podClient.Create(host0Pod) framework.ExpectNoError(err, fmt.Sprintf("Failed to create host0Pod: %v", err))