Fix mount argument tests

awslabs · Nov 7, 2023 · 79534b5 · 79534b5
1 parent dd24f13
commit 79534b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/driver/node.go b/pkg/driver/node.go
@@ -88,7 +88,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 			// if there is a space between, replace it with an = sign
 			mountFlags[i] = strings.Replace(strings.Join(strings.Fields(strings.Trim(mountFlags[i], " ")), " "), " ", "=", -1)
 			// prepend -- if it's not already there
-			if !strings.HasPrefix(mountFlags[i], "--") {
+			if !strings.HasPrefix(mountFlags[i], "-") {
 				mountFlags[i] = "--" + mountFlags[i]
 			}
 		}

diff --git a/pkg/driver/node_test.go b/pkg/driver/node_test.go
@@ -124,7 +124,7 @@ func TestNodePublishVolume(t *testing.T) {
 				}
 
 				nodeTestEnv.mockMounter.EXPECT().MakeDir(gomock.Eq(targetPath)).Return(nil)
-				nodeTestEnv.mockMounter.EXPECT().IsLikelyNotMountPoint(gomock.Eq(targetPath)).Return(false, nil)
+				nodeTestEnv.mockMounter.EXPECT().IsLikelyNotMountPoint(gomock.Eq(targetPath)).Return(true, nil)
 				nodeTestEnv.mockMounter.EXPECT().Mount(gomock.Eq(volumeId), gomock.Eq(targetPath), gomock.Eq("unused"), gomock.Eq([]string{"--bar", "--foo", "--read-only", "--test=123"}))
 				_, err := nodeTestEnv.driver.NodePublishVolume(ctx, req)
 				if err != nil {
@@ -156,8 +156,10 @@ func TestNodePublishVolume(t *testing.T) {
 				}
 
 				nodeTestEnv.mockMounter.EXPECT().MakeDir(gomock.Eq(targetPath)).Return(nil)
-				nodeTestEnv.mockMounter.EXPECT().IsLikelyNotMountPoint(gomock.Eq(targetPath)).Return(false, nil)
-				nodeTestEnv.mockMounter.EXPECT().Mount(gomock.Eq(volumeId), gomock.Eq(targetPath), gomock.Eq("unused"), gomock.Eq([]string{"--test=123", "--foo"}))
+				nodeTestEnv.mockMounter.EXPECT().IsLikelyNotMountPoint(gomock.Eq(targetPath)).Return(true, nil)
+				nodeTestEnv.mockMounter.EXPECT().Mount(
+					gomock.Eq(volumeId), gomock.Eq(targetPath), gomock.Eq("unused"),
+					gomock.Eq([]string{"--read-only", "--test=123"})).Return(nil)
 				_, err := nodeTestEnv.driver.NodePublishVolume(ctx, req)
 				if err != nil {
 					t.Fatalf("NodePublishVolume is failed: %v", err)