From 33046e3aa5b6dabc3c724b2cb9dae8f039363b39 Mon Sep 17 00:00:00 2001 From: tanshanshan Date: Wed, 5 Sep 2018 15:55:41 +0800 Subject: [PATCH] nits in e2e test --- test/e2e/storage/vsphere/config.go | 7 ++++--- test/e2e/storage/vsphere/pvc_label_selector.go | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/storage/vsphere/config.go b/test/e2e/storage/vsphere/config.go index 07a608ae701..98f3feb0c35 100644 --- a/test/e2e/storage/vsphere/config.go +++ b/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) } diff --git a/test/e2e/storage/vsphere/pvc_label_selector.go b/test/e2e/storage/vsphere/pvc_label_selector.go index 21eb3d5b1e4..3de1e2bbcf4 100644 --- a/test/e2e/storage/vsphere/pvc_label_selector.go +++ b/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