Merge pull request #68275 from tanshanshan/fixtypo-0905-2

test/e2e/storage/vsphere/config.go

@@ -19,10 +19,11 @@ package vsphere
 import (
 	"errors"
 	"fmt"
-	"gopkg.in/gcfg.v1"
 	"io"
-	"k8s.io/kubernetes/test/e2e/framework"
 	"os"
+
+	"gopkg.in/gcfg.v1"
+	"k8s.io/kubernetes/test/e2e/framework"
 )
 
 const (
@@ -147,7 +148,7 @@ func populateInstanceMap(cfg *ConfigFile) (map[string]*VSphere, error) {
 			vcConfig.Password = cfg.Global.Password
 		}
 		if vcConfig.Username == "" {
-			msg := fmt.Sprintf("vcConfig.User is empty for vc %s!", vcServer)
+			msg := fmt.Sprintf("vcConfig.Username is empty for vc %s!", vcServer)
 			framework.Logf(msg)
 			return nil, errors.New(msg)
 		}

test/e2e/storage/vsphere/pvc_label_selector.go

@@ -105,9 +105,8 @@ var _ = utils.SIGDescribe("PersistentVolumes [Feature:LabelSelector]", func() {
 })
 
 func testSetupVSpherePVClabelselector(c clientset.Interface, nodeInfo *NodeInfo, ns string, ssdlabels map[string]string, vvollabels map[string]string) (volumePath string, pv_ssd *v1.PersistentVolume, pvc_ssd *v1.PersistentVolumeClaim, pvc_vvol *v1.PersistentVolumeClaim, err error) {
-	volumePath = ""
 	By("creating vmdk")
-	Expect(err).NotTo(HaveOccurred())
+	volumePath = ""
 	volumePath, err = nodeInfo.VSphere.CreateVolume(&VolumeOptions{}, nodeInfo.DataCenterRef)
 	if err != nil {
 		return