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

Merge pull request #102682 from chendave/e2e_storage

Browse Source 
Check empty zone after the validation of providers
This commit is contained in:
Kubernetes Prow Robot 2021-06-24 18:56:44 -07:00 committed by GitHub
commit 7a9c8940fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/storage/volume_provisioning.go
View File

@ -350,6 +350,10 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
continue continue
} }
if zone, ok := test.Parameters["zone"]; ok {
framework.ExpectNotEqual(len(zone), 0, "expect at least one zone")
}
ginkgo.By("Testing " + test.Name) ginkgo.By("Testing " + test.Name)
suffix := fmt.Sprintf("%d", i) suffix := fmt.Sprintf("%d", i)
test.Client = c test.Client = c
@ -1000,9 +1004,11 @@ func deleteProvisionedVolumesAndDisks(c clientset.Interface, pvs []*v1.Persisten
func getRandomClusterZone(c clientset.Interface) string { func getRandomClusterZone(c clientset.Interface) string {
zones, err := e2enode.GetClusterZones(c) zones, err := e2enode.GetClusterZones(c)
zone := ""
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectNotEqual(len(zones), 0) if len(zones) != 0 {
zonesList := zones.UnsortedList() zonesList := zones.UnsortedList()
return zonesList[rand.Intn(zones.Len())] zone = zonesList[rand.Intn(zones.Len())]
}
return zone
} }