From 7b5dac03ce15ab814b882e4439cbc04e2287b8b3 Mon Sep 17 00:00:00 2001
From: caiweidong <caiweidong@baidu.com>
Date: Thu, 1 Aug 2019 14:15:33 +0800
Subject: [PATCH] Fix some unreasonable places int csi ut

---
 pkg/volume/csi/csi_mounter_test.go | 12 ++++----
 pkg/volume/csi/csi_plugin_test.go  | 18 ++++++------
 pkg/volume/csi/expander_test.go    | 44 ++++++++++++++++--------------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkg/volume/csi/csi_mounter_test.go b/pkg/volume/csi/csi_mounter_test.go
index 82f75a8a679..10d831d8a0b 100644
--- a/pkg/volume/csi/csi_mounter_test.go
+++ b/pkg/volume/csi/csi_mounter_test.go
@@ -84,10 +84,10 @@ func TestMounterGetPath(t *testing.T) {
 		}
 		csiMounter := mounter.(*csiMountMgr)
 
-		path := csiMounter.GetPath()
+		mountPath := csiMounter.GetPath()
 
-		if tc.path != path {
-			t.Errorf("expecting path %s, got %s", tc.path, path)
+		if tc.path != mountPath {
+			t.Errorf("expecting path %s, got %s", tc.path, mountPath)
 		}
 	}
 }
@@ -215,10 +215,10 @@ func MounterSetUpTests(t *testing.T, podInfoEnabled bool) {
 				t.Errorf("default value of file system type was overridden by type %s", csiMounter.spec.PersistentVolume.Spec.CSI.FSType)
 			}
 
-			path := csiMounter.GetPath()
-			if _, err := os.Stat(path); err != nil {
+			mountPath := csiMounter.GetPath()
+			if _, err := os.Stat(mountPath); err != nil {
 				if os.IsNotExist(err) {
-					t.Errorf("SetUp() failed, volume path not created: %s", path)
+					t.Errorf("SetUp() failed, volume path not created: %s", mountPath)
 				} else {
 					t.Errorf("SetUp() failed: %v", err)
 				}
diff --git a/pkg/volume/csi/csi_plugin_test.go b/pkg/volume/csi/csi_plugin_test.go
index e4ec6ae674a..62bb18bbd95 100644
--- a/pkg/volume/csi/csi_plugin_test.go
+++ b/pkg/volume/csi/csi_plugin_test.go
@@ -549,12 +549,11 @@ func TestPluginNewMounter(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		plug, tmpDir := newTestPlugin(t, nil)
-		defer os.RemoveAll(tmpDir)
-
-		registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
-
 		t.Run(test.name, func(t *testing.T) {
+			plug, tmpDir := newTestPlugin(t, nil)
+			defer os.RemoveAll(tmpDir)
+
+			registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
 			mounter, err := plug.NewMounter(
 				test.spec,
 				&api.Pod{ObjectMeta: meta.ObjectMeta{UID: test.podUID, Namespace: test.namespace}},
@@ -668,12 +667,11 @@ func TestPluginNewMounterWithInline(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		plug, tmpDir := newTestPlugin(t, nil)
-		defer os.RemoveAll(tmpDir)
-
-		registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
-
 		t.Run(test.name, func(t *testing.T) {
+			plug, tmpDir := newTestPlugin(t, nil)
+			defer os.RemoveAll(tmpDir)
+
+			registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
 			mounter, err := plug.NewMounter(
 				test.spec,
 				&api.Pod{ObjectMeta: meta.ObjectMeta{UID: test.podUID, Namespace: test.namespace}},
diff --git a/pkg/volume/csi/expander_test.go b/pkg/volume/csi/expander_test.go
index 0bd9f128e20..4e742ae5981 100644
--- a/pkg/volume/csi/expander_test.go
+++ b/pkg/volume/csi/expander_test.go
@@ -64,31 +64,33 @@ func TestNodeExpand(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		plug, tmpDir := newTestPlugin(t, nil)
-		defer os.RemoveAll(tmpDir)
+		t.Run(tc.name, func(t *testing.T) {
+			plug, tmpDir := newTestPlugin(t, nil)
+			defer os.RemoveAll(tmpDir)
 
-		spec := volume.NewSpecFromPersistentVolume(makeTestPV("test-pv", 10, "expandable", "test-vol"), false)
+			spec := volume.NewSpecFromPersistentVolume(makeTestPV("test-pv", 10, "expandable", "test-vol"), false)
 
-		newSize, _ := resource.ParseQuantity("20Gi")
+			newSize, _ := resource.ParseQuantity("20Gi")
 
-		resizeOptions := volume.NodeResizeOptions{
-			VolumeSpec:      spec,
-			NewSize:         newSize,
-			DeviceMountPath: "/foo/bar",
-			CSIVolumePhase:  tc.volumePhase,
-		}
-		csiSource, _ := getCSISourceFromSpec(resizeOptions.VolumeSpec)
-
-		csClient := setupClientWithExpansion(t, tc.nodeStageSet, tc.nodeExpansion)
-
-		ok, err := plug.nodeExpandWithClient(resizeOptions, csiSource, csClient)
-		if ok != tc.success {
-			if err != nil {
-				t.Errorf("For %s : expected %v got %v with %v", tc.name, tc.success, ok, err)
-			} else {
-				t.Errorf("For %s : expected %v got %v", tc.name, tc.success, ok)
+			resizeOptions := volume.NodeResizeOptions{
+				VolumeSpec:      spec,
+				NewSize:         newSize,
+				DeviceMountPath: "/foo/bar",
+				CSIVolumePhase:  tc.volumePhase,
 			}
+			csiSource, _ := getCSISourceFromSpec(resizeOptions.VolumeSpec)
 
-		}
+			csClient := setupClientWithExpansion(t, tc.nodeStageSet, tc.nodeExpansion)
+
+			ok, err := plug.nodeExpandWithClient(resizeOptions, csiSource, csClient)
+			if ok != tc.success {
+				if err != nil {
+					t.Errorf("For %s : expected %v got %v with %v", tc.name, tc.success, ok, err)
+				} else {
+					t.Errorf("For %s : expected %v got %v", tc.name, tc.success, ok)
+				}
+
+			}
+		})
 	}
 }