Skip to content

Commit d85b3c3

Browse files
refactor: add skipTestIfWindows method to reduce lines of code
Signed-off-by: Mayank Shah <[email protected]>
1 parent a311dcc commit d85b3c3

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

pkg/smb/nodeserver_test.go

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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

4648
func 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

192192
func 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

299296
func 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

354348
func 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

pkg/smb/smb_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ func TestNewFakeDriver(t *testing.T) {
4343
}
4444

4545
func TestIsCorruptedDir(t *testing.T) {
46-
if isWindows() {
47-
t.Skip("Skipping tests on windows")
48-
}
49-
46+
skipTestIfWindows(t)
5047
existingMountPath, err := ioutil.TempDir(os.TempDir(), "csi-mount-test")
5148
if err != nil {
5249
t.Fatalf("failed to create tmp dir: %v", err)

0 commit comments

Comments
 (0)