github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100741 from mengjiao-liu/fix-test-err

Browse Source 
Fix  incorrect test code in pkg/volume/csi/csi_attacher_test.go file
This commit is contained in:
Kubernetes Prow Robot 2021-06-08 08:33:12 -07:00 committed by GitHub
commit 8b787f3a22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/csi/csi_attacher_test.go
View File

@ -754,7 +754,7 @@ func TestAttacherWaitForVolumeAttachment(t *testing.T) {
if tc.shouldFail && err == nil { if tc.shouldFail && err == nil {
t.Error("expecting failure, but err is nil") t.Error("expecting failure, but err is nil")
} }
if tc.initAttachErr != nil { if tc.initAttachErr != nil && err != nil {
if tc.initAttachErr.Message != err.Error() { if tc.initAttachErr.Message != err.Error() {
t.Errorf("expecting error [%v], got [%v]", tc.initAttachErr.Message, err.Error()) t.Errorf("expecting error [%v], got [%v]", tc.initAttachErr.Message, err.Error())
} }
@ -1268,7 +1268,7 @@ func TestAttacherMountDevice(t *testing.T) {
} }
return return
} }
if err == nil && tc.shouldFail { if tc.shouldFail {
t.Errorf("test should fail, but no error occurred") t.Errorf("test should fail, but no error occurred")
} }
@ -1440,7 +1440,7 @@ func TestAttacherMountDeviceWithInline(t *testing.T) {
} }
return return
} }
if err == nil && tc.shouldFail { if tc.shouldFail {
t.Errorf("test should fail, but no error occurred") t.Errorf("test should fail, but no error occurred")
} }
@ -1585,7 +1585,7 @@ func TestAttacherUnmountDevice(t *testing.T) {
} }
return return
} }
if err == nil && tc.shouldFail { if tc.shouldFail {
t.Errorf("test should fail, but no error occurred") t.Errorf("test should fail, but no error occurred")
} }