From 33feaee2c2dd77e59a68a303f063275733258a59 Mon Sep 17 00:00:00 2001
From: Jing Xu <jinxu@google.com>
Date: Thu, 15 Jul 2021 15:52:07 -0700
Subject: [PATCH] Fix windows storage tests

1. fix command empty issue for some Windows storage tests
2. enable more windows storage tests by adding ntfs test patten

Change-Id: Ic33be282d669a23107474a14d4368bbf95c9b459
---
 test/e2e/framework/pod/create.go           | 2 +-
 test/e2e/storage/testsuites/multivolume.go | 1 +
 test/e2e/storage/testsuites/volume_io.go   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/e2e/framework/pod/create.go b/test/e2e/framework/pod/create.go
index 32d7b0bb11b..900ffdbe998 100644
--- a/test/e2e/framework/pod/create.go
+++ b/test/e2e/framework/pod/create.go
@@ -166,7 +166,7 @@ func MakeSecPod(podConfig *Config) (*v1.Pod, error) {
 	if podConfig.NS == "" {
 		return nil, fmt.Errorf("Cannot create pod with empty namespace")
 	}
-	if len(podConfig.Command) == 0 && !NodeOSDistroIs("windows") {
+	if len(podConfig.Command) == 0 {
 		podConfig.Command = "trap exit TERM; while true; do sleep 1; done"
 	}
 
diff --git a/test/e2e/storage/testsuites/multivolume.go b/test/e2e/storage/testsuites/multivolume.go
index 2473dfe2af7..23155c7fac7 100644
--- a/test/e2e/storage/testsuites/multivolume.go
+++ b/test/e2e/storage/testsuites/multivolume.go
@@ -67,6 +67,7 @@ func InitMultiVolumeTestSuite() storageframework.TestSuite {
 		storageframework.BlockVolModeDynamicPV,
 		storageframework.Ext4DynamicPV,
 		storageframework.XfsDynamicPV,
+		storageframework.NtfsDynamicPV,
 	}
 	return InitCustomMultiVolumeTestSuite(patterns)
 }
diff --git a/test/e2e/storage/testsuites/volume_io.go b/test/e2e/storage/testsuites/volume_io.go
index ad4c627d66f..fb84162e0d4 100644
--- a/test/e2e/storage/testsuites/volume_io.go
+++ b/test/e2e/storage/testsuites/volume_io.go
@@ -80,6 +80,7 @@ func InitVolumeIOTestSuite() storageframework.TestSuite {
 		storageframework.DefaultFsInlineVolume,
 		storageframework.DefaultFsPreprovisionedPV,
 		storageframework.DefaultFsDynamicPV,
+		storageframework.NtfsDynamicPV,
 	}
 	return InitCustomVolumeIOTestSuite(patterns)
 }
@@ -143,7 +144,7 @@ func (t *volumeIOTestSuite) DefineTests(driver storageframework.TestDriver, patt
 		l.migrationCheck.validateMigrationVolumeOpCounts()
 	}
 
-	ginkgo.It("should write files of various sizes, verify size, validate content [Slow][LinuxOnly]", func() {
+	ginkgo.It("should write files of various sizes, verify size, validate content [Slow]", func() {
 		init()
 		defer cleanup()