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

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

Browse Source 
nits in e2e test
This commit is contained in:
Kubernetes Prow Robot 2018-12-06 19:02:57 -08:00 committed by GitHub
commit a5887009fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,10 +19,11 @@ package vsphere
import ( import (
"errors" "errors"
"fmt" "fmt"
"gopkg.in/gcfg.v1"
"io" "io"
"k8s.io/kubernetes/test/e2e/framework"
"os" "os"
"gopkg.in/gcfg.v1"
"k8s.io/kubernetes/test/e2e/framework"
) )
const ( const (
@ -147,7 +148,7 @@ func populateInstanceMap(cfg *ConfigFile) (map[string]*VSphere, error) {
vcConfig.Password = cfg.Global.Password vcConfig.Password = cfg.Global.Password
} }
if vcConfig.Username == "" { 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) framework.Logf(msg)
return nil, errors.New(msg) return nil, errors.New(msg)
} }

3
test/e2e/storage/vsphere/pvc_label_selector.go
View File

@ -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) { 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") By("creating vmdk")
Expect(err).NotTo(HaveOccurred()) volumePath = ""
volumePath, err = nodeInfo.VSphere.CreateVolume(&VolumeOptions{}, nodeInfo.DataCenterRef) volumePath, err = nodeInfo.VSphere.CreateVolume(&VolumeOptions{}, nodeInfo.DataCenterRef)
if err != nil { if err != nil {
return return