Merge pull request #62590 from mlmhl/csi_test

Automatic merge from submit-queue (batch tested with PRs 62590, 62818, 63015, 62922, 63000). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix some bugs inside CSI volume plugin unit test TestAttacherMountDevice **What this PR does / why we need it**: Fix two bugs inside CSI volume plugin unit test `TestAttacherMountDevice`. **Release note**: ```release-note None ```

Merge pull request #62590 from mlmhl/csi_test
b692b715 · Kubernetes Submit Queue · GitHub · b2ab9012 · 123ba1b4 · b692b715
Unverified Commit b692b715 authored Apr 24, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

csi_attacher_test.go pkg/volume/csi/csi_attacher_test.go +2 -2

No files found.
--- a/pkg/volume/csi/csi_attacher_test.go
+++ b/pkg/volume/csi/csi_attacher_test.go
@@ -468,7 +468,7 @@ func TestAttacherMountDevice(t *testing.T) {
 			devicePath:      "",
 			deviceMountPath: "path2",
 			stageUnstageSet: true,
-			shouldFail:      true,
+			shouldFail:      false,
 		},
 		{
 			testName:        "no device mount path",
@@ -533,7 +533,7 @@ func TestAttacherMountDevice(t *testing.T) {
 			if !tc.shouldFail {
 				t.Errorf("test should not fail, but error occurred: %v", err)
 			}
-			return
+			continue
 		}
 		if err == nil && tc.shouldFail {
 			t.Errorf("test should fail, but no error occurred")