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

in each pd test, create and delete the pod for every iteration to give exec the unique pod name

Browse Source 
Signed-off-by: Huamin Chen <hchen@redhat.com>
This commit is contained in:
Huamin Chen 2016-06-10 15:10:02 +00:00
parent 076bf71eed
commit 100222ff31
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/pd.go
View File

@ -176,14 +176,15 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
diskName, err := createPDWithRetry() diskName, err := createPDWithRetry()
framework.ExpectNoError(err, "Error creating PD") framework.ExpectNoError(err, "Error creating PD")
numContainers := 4 numContainers := 4
var host0Pod *api.Pod
host0Pod := testPDPod([]string{diskName}, host0Name, false /* readOnly */, numContainers)
defer func() { defer func() {
By("cleaning up PD-RW test environment") By("cleaning up PD-RW test environment")
// Teardown pods, PD. Ignore errors. // Teardown pods, PD. Ignore errors.
// Teardown should do nothing unless test failed. // 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}) detachAndDeletePDs(diskName, []string{host0Name})
}() }()
@ -191,6 +192,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
framework.Logf("PD Read/Writer Iteration #%v", i) framework.Logf("PD Read/Writer Iteration #%v", i)
By("submitting host0Pod to kubernetes") By("submitting host0Pod to kubernetes")
host0Pod = testPDPod([]string{diskName}, host0Name, false /* readOnly */, numContainers)
_, err = podClient.Create(host0Pod) _, err = podClient.Create(host0Pod)
framework.ExpectNoError(err, fmt.Sprintf("Failed to create host0Pod: %v", err)) framework.ExpectNoError(err, fmt.Sprintf("Failed to create host0Pod: %v", err))
@ -227,14 +229,15 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
By("creating PD2") By("creating PD2")
disk2Name, err := createPDWithRetry() disk2Name, err := createPDWithRetry()
framework.ExpectNoError(err, "Error creating PD2") framework.ExpectNoError(err, "Error creating PD2")
var host0Pod *api.Pod
host0Pod := testPDPod([]string{disk1Name, disk2Name}, host0Name, false /* readOnly */, 1 /* numContainers */)
defer func() { defer func() {
By("cleaning up PD-RW test environment") By("cleaning up PD-RW test environment")
// Teardown pods, PD. Ignore errors. // Teardown pods, PD. Ignore errors.
// Teardown should do nothing unless test failed. // 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(disk1Name, []string{host0Name})
detachAndDeletePDs(disk2Name, []string{host0Name}) detachAndDeletePDs(disk2Name, []string{host0Name})
}() }()
@ -244,6 +247,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
framework.Logf("PD Read/Writer Iteration #%v", i) framework.Logf("PD Read/Writer Iteration #%v", i)
By("submitting host0Pod to kubernetes") By("submitting host0Pod to kubernetes")
host0Pod = testPDPod([]string{disk1Name, disk2Name}, host0Name, false /* readOnly */, 1 /* numContainers */)
_, err = podClient.Create(host0Pod) _, err = podClient.Create(host0Pod)
framework.ExpectNoError(err, fmt.Sprintf("Failed to create host0Pod: %v", err)) framework.ExpectNoError(err, fmt.Sprintf("Failed to create host0Pod: %v", err))