github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

fix diskName assignment

Browse Source
This commit is contained in:
Antonio Ojea 2021-11-16 22:39:45 +01:00
parent e1821c13eb
commit 05f9a86f41
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/legacy-cloud-providers/gce/gce_disks_test.go
View File

@ -29,7 +29,7 @@ import (
computebeta "google.golang.org/api/compute/v0.beta" computebeta "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1" compute "google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
cloudprovider "k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
@ -268,13 +268,12 @@ func TestCreateDisk_MultiZone(t *testing.T) {
nodeInformerSynced: func() bool { return true }, nodeInformerSynced: func() bool { return true },
} }
var diskName string
diskType := DiskTypeStandard diskType := DiskTypeStandard
const sizeGb int64 = 128 const sizeGb int64 = 128
/* Act & Assert */ /* Act & Assert */
for _, zone := range gce.managedZones { for _, zone := range gce.managedZones {
diskName = zone + "disk" diskName := zone + "disk"
_, err := gce.CreateDisk(diskName, diskType, zone, sizeGb, nil) _, err := gce.CreateDisk(diskName, diskType, zone, sizeGb, nil)
if err != nil { if err != nil {
t.Errorf("Error creating disk in zone '%v'; error: \"%v\"", zone, err) t.Errorf("Error creating disk in zone '%v'; error: \"%v\"", zone, err)
@ -420,19 +419,19 @@ func TestDeleteDisk_DiffDiskMultiZone(t *testing.T) {
nodeZones: createNodeZones(zonesWithNodes), nodeZones: createNodeZones(zonesWithNodes),
nodeInformerSynced: func() bool { return true }, nodeInformerSynced: func() bool { return true },
} }
var diskName string
diskType := DiskTypeSSD diskType := DiskTypeSSD
const sizeGb int64 = 128 const sizeGb int64 = 128
for _, zone := range gce.managedZones { for _, zone := range gce.managedZones {
diskName = zone + "disk" diskName := zone + "disk"
gce.CreateDisk(diskName, diskType, zone, sizeGb, nil) gce.CreateDisk(diskName, diskType, zone, sizeGb, nil)
} }
/* Act & Assert */ /* Act & Assert */
var err error var err error
for _, zone := range gce.managedZones { for _, zone := range gce.managedZones {
diskName = zone + "disk" diskName := zone + "disk"
err = gce.DeleteDisk(diskName) err = gce.DeleteDisk(diskName)
if err != nil { if err != nil {
t.Errorf("Error deleting disk in zone '%v'; error: \"%v\"", zone, err) t.Errorf("Error deleting disk in zone '%v'; error: \"%v\"", zone, err)