@@ -38,15 +38,15 @@ const (
3838 targetTest = "./target_test"
3939)
4040
41- // checks if the underlying OS is Windows
42- func isWindows () bool {
43- return runtime .GOOS == "windows"
41+ // skip test if running on windows
42+ func skipTestIfWindows (t * testing.T ) {
43+ if runtime .GOOS == "windows" {
44+ t .Skip ("Skipping test on Windows" )
45+ }
4446}
4547
4648func TestNodeStageVolume (t * testing.T ) {
47- if isWindows () {
48- t .Skip ("Skipping tests on Windows" )
49- }
49+ skipTestIfWindows (t )
5050
5151 stdVolCap := csi.VolumeCapability {
5252 AccessType : & csi.VolumeCapability_Mount {
@@ -190,10 +190,7 @@ func TestNodeExpandVolume(t *testing.T) {
190190}
191191
192192func TestNodePublishVolume (t * testing.T ) {
193- if isWindows () {
194- t .Skip ("Skipping tests on Windows" )
195- }
196-
193+ skipTestIfWindows (t )
197194 volumeCap := csi.VolumeCapability_AccessMode {Mode : csi .VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER }
198195 errorMountSource := "./error_mount_source"
199196 alreadyMountedTarget := "./false_is_likely_exist_target"
@@ -297,10 +294,7 @@ func TestNodePublishVolume(t *testing.T) {
297294}
298295
299296func TestNodeUnpublishVolume (t * testing.T ) {
300- if isWindows () {
301- t .Skip ("Skipping tests on Windows" )
302- }
303-
297+ skipTestIfWindows (t )
304298 errorTarget := "./error_is_likely_target"
305299 targetFile := "./abc.go"
306300
@@ -352,10 +346,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
352346}
353347
354348func TestNodeUnstageVolume (t * testing.T ) {
355- if isWindows () {
356- t .Skip ("Skipping tests on Windows" )
357- }
358-
349+ skipTestIfWindows (t )
359350 errorTarget := "./error_is_likely_target"
360351 targetFile := "./abc.go"
361352
0 commit comments