github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

fix errors in wrapped format

Browse Source 
Signed-off-by: wangyx1992 <wang.yixiang@zte.com.cn>
This commit is contained in:
wangyx1992
2021-03-12 16:55:47 +08:00
parent fcee7a0105
commit 34c2b2360b
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/volume/vsphere_volume/attacher_test.go
View File

@@ -20,6 +20,7 @@ package vsphere_volume
import (
"errors"
"fmt"
"testing"
v1 "k8s.io/api/core/v1"
@@ -31,6 +32,13 @@ import (
"k8s.io/klog/v2"
)
var (
// diskNameErr is the error when disk name is wrong.
diskNameErr = errors.New("wrong diskName")
// nodeNameErr is the error when node name is wrong.
nodeNameErr = errors.New("wrong nodeName")
)
func TestGetDeviceName_Volume(t *testing.T) {
plugin := newPlugin(t)
volPath := "[local] volumes/test"
@@ -247,12 +255,12 @@ func (testcase *testcase) AttachDisk(diskName string, storagePolicyName string,
if expected.diskName != diskName {
testcase.t.Errorf("Unexpected AttachDisk call: expected diskName %s, got %s", expected.diskName, diskName)
return "", errors.New("Unexpected AttachDisk call: wrong diskName")
return "", fmt.Errorf(`Unexpected AttachDisk call: %w`, diskNameErr)
}
if expected.nodeName != nodeName {
testcase.t.Errorf("Unexpected AttachDisk call: expected nodeName %s, got %s", expected.nodeName, nodeName)
return "", errors.New("Unexpected AttachDisk call: wrong nodeName")
return "", fmt.Errorf(`Unexpected AttachDisk call: %w`, nodeNameErr)
}
klog.V(4).Infof("AttachDisk call: %s, %s, returning %q, %v", diskName, nodeName, expected.retDeviceUUID, expected.ret)
@@ -272,12 +280,12 @@ func (testcase *testcase) DetachDisk(diskName string, nodeName types.NodeName) e
if expected.diskName != diskName {
testcase.t.Errorf("Unexpected DetachDisk call: expected diskName %s, got %s", expected.diskName, diskName)
return errors.New("Unexpected DetachDisk call: wrong diskName")
return fmt.Errorf(`Unexpected DetachDisk call: %w`, diskNameErr)
}
if expected.nodeName != nodeName {
testcase.t.Errorf("Unexpected DetachDisk call: expected nodeName %s, got %s", expected.nodeName, nodeName)
return errors.New("Unexpected DetachDisk call: wrong nodeName")
return fmt.Errorf(`Unexpected DetachDisk call: %w`, nodeNameErr)
}
klog.V(4).Infof("DetachDisk call: %s, %s, returning %v", diskName, nodeName, expected.ret)
@@ -297,12 +305,12 @@ func (testcase *testcase) DiskIsAttached(diskName string, nodeName types.NodeNam
if expected.diskName != diskName {
testcase.t.Errorf("Unexpected DiskIsAttached call: expected diskName %s, got %s", expected.diskName, diskName)
return false, diskName, errors.New("Unexpected DiskIsAttached call: wrong diskName")
return false, diskName, fmt.Errorf(`Unexpected DiskIsAttached call: %w`, diskNameErr)
}
if expected.nodeName != nodeName {
testcase.t.Errorf("Unexpected DiskIsAttached call: expected nodeName %s, got %s", expected.nodeName, nodeName)
return false, diskName, errors.New("Unexpected DiskIsAttached call: wrong nodeName")
return false, diskName, fmt.Errorf(`Unexpected DiskIsAttached call: %w`, nodeNameErr)
}
klog.V(4).Infof("DiskIsAttached call: %s, %s, returning %v, %v", diskName, nodeName, expected.isAttached, expected.ret)