github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 00:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103725 from jingxu97/July/wintests

Browse Source 
Fix windows storage tests
This commit is contained in:
Kubernetes Prow Robot 2021-07-21 15:01:51 -07:00 committed by GitHub
commit 85a29212e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/pod/create.go
View File

@ -166,7 +166,7 @@ func MakeSecPod(podConfig *Config) (*v1.Pod, error) {
if podConfig.NS == "" { if podConfig.NS == "" {
return nil, fmt.Errorf("Cannot create pod with empty namespace") 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" podConfig.Command = "trap exit TERM; while true; do sleep 1; done"
} }

1
test/e2e/storage/testsuites/multivolume.go
View File

@ -67,6 +67,7 @@ func InitMultiVolumeTestSuite() storageframework.TestSuite {
storageframework.BlockVolModeDynamicPV, storageframework.BlockVolModeDynamicPV,
storageframework.Ext4DynamicPV, storageframework.Ext4DynamicPV,
storageframework.XfsDynamicPV, storageframework.XfsDynamicPV,
storageframework.NtfsDynamicPV,
} }
return InitCustomMultiVolumeTestSuite(patterns) return InitCustomMultiVolumeTestSuite(patterns)
} }

3
test/e2e/storage/testsuites/volume_io.go
View File

@ -80,6 +80,7 @@ func InitVolumeIOTestSuite() storageframework.TestSuite {
storageframework.DefaultFsInlineVolume, storageframework.DefaultFsInlineVolume,
storageframework.DefaultFsPreprovisionedPV, storageframework.DefaultFsPreprovisionedPV,
storageframework.DefaultFsDynamicPV, storageframework.DefaultFsDynamicPV,
storageframework.NtfsDynamicPV,
} }
return InitCustomVolumeIOTestSuite(patterns) return InitCustomVolumeIOTestSuite(patterns)
} }
@ -143,7 +144,7 @@ func (t *volumeIOTestSuite) DefineTests(driver storageframework.TestDriver, patt
l.migrationCheck.validateMigrationVolumeOpCounts() 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() init()
defer cleanup() defer cleanup()