github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

fix staticcheck failures of e2e/storage/utils e2e/storage/vsphere

Browse Source
This commit is contained in:
SataQiu 2019-12-11 10:33:21 +08:00
parent 30a5db136f
commit e70120f083
8 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.staticcheck_failures
View File

@ -67,8 +67,6 @@ test/e2e/autoscaling
test/e2e/instrumentation/logging/stackdriver
test/e2e/instrumentation/monitoring
test/e2e/manifest
test/e2e/storage/utils
test/e2e/storage/vsphere
test/images/agnhost/dns
test/images/agnhost/inclusterclient
test/images/agnhost/net/nat

2
test/e2e/storage/utils/utils.go
View File

@ -644,7 +644,7 @@ func genBinDataFromSeed(len int, seed int64) []byte {
binData := make([]byte, len)
rand.Seed(seed)
len, err := rand.Read(binData)
_, err := rand.Read(binData)
if err != nil {
fmt.Printf("Error: %v\n", err)
}

2
test/e2e/storage/vsphere/pv_reclaimpolicy.go
View File

@ -245,7 +245,7 @@ func deletePVCAfterBind(c clientset.Interface, ns string, pvc *v1.PersistentVolu
ginkgo.By("delete pvc")
framework.ExpectNoError(e2epv.DeletePersistentVolumeClaim(c, pvc.Name, ns), "Failed to delete PVC ", pvc.Name)
pvc, err = c.CoreV1().PersistentVolumeClaims(ns).Get(pvc.Name, metav1.GetOptions{})
_, err = c.CoreV1().PersistentVolumeClaims(ns).Get(pvc.Name, metav1.GetOptions{})
if !apierrs.IsNotFound(err) {
framework.ExpectNoError(err)
}

1
test/e2e/storage/vsphere/vsphere_scale.go
View File

@ -157,6 +157,7 @@ var _ = utils.SIGDescribe("vcp at scale [Feature:vsphere] ", func() {
}
}
podList, err := client.CoreV1().Pods(namespace).List(metav1.ListOptions{})
framework.ExpectNoError(err, "Failed to list pods")
for _, pod := range podList.Items {
pvcClaimList = append(pvcClaimList, getClaimsForPod(&pod, volumesPerPod)...)
ginkgo.By("Deleting pod")

1
test/e2e/storage/vsphere/vsphere_volume_datastore.go
View File

@ -92,5 +92,6 @@ func invokeInvalidDatastoreTestNeg(client clientset.Interface, namespace string,
framework.ExpectError(err)
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
framework.ExpectNoError(err)
return fmt.Errorf("Failure message: %+q", eventList.Items[0].Message)
}

1
test/e2e/storage/vsphere/vsphere_volume_fstype.go
View File

@ -130,6 +130,7 @@ func invokeTestForInvalidFstype(f *framework.Framework, client clientset.Interfa
framework.ExpectError(err)
eventList, err := client.CoreV1().Events(namespace).List(metav1.ListOptions{})
framework.ExpectNoError(err)
// Detach and delete volume
detachVolume(f, client, pod, persistentvolumes[0].Spec.VsphereVolume.VolumePath)

1
test/e2e/storage/vsphere/vsphere_volume_vsan_policy.go
View File

@ -321,6 +321,7 @@ func invokeInvalidPolicyTestNeg(client clientset.Interface, namespace string, sc
framework.ExpectError(err)
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
framework.ExpectNoError(err)
return fmt.Errorf("Failure message: %+q", eventList.Items[0].Message)
}

7
test/e2e/storage/vsphere/vsphere_zone_support.go
View File

@ -439,6 +439,8 @@ func verifyPodAndPvcCreationFailureOnWaitForFirstConsumerMode(client clientset.I
framework.ExpectError(err)
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
framework.ExpectNoError(err)
// Look for PVC ProvisioningFailed event and return the message.
for _, event := range eventList.Items {
if event.Source.Component == "persistentvolume-controller" && event.Reason == volumeevents.ProvisioningFailed {
@ -484,14 +486,13 @@ func verifyPVCCreationFails(client clientset.Interface, namespace string, scPara
framework.ExpectNoError(err)
defer e2epv.DeletePersistentVolumeClaim(client, pvclaim.Name, namespace)
var pvclaims []*v1.PersistentVolumeClaim
pvclaims = append(pvclaims, pvclaim)
ginkgo.By("Waiting for claim to be in bound phase")
err = e2epv.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, client, pvclaim.Namespace, pvclaim.Name, framework.Poll, 2*time.Minute)
framework.ExpectError(err)
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
framework.ExpectNoError(err)
framework.Logf("Failure message : %+q", eventList.Items[0].Message)
return fmt.Errorf("Failure message: %+q", eventList.Items[0].Message)
}