From 62f0b7df7be55c640c4d44cc579725727d913e66 Mon Sep 17 00:00:00 2001
From: Michelle Au <msau@google.com>
Date: Thu, 15 Aug 2019 15:08:14 -0700
Subject: [PATCH] Disable kubelet restart tests for file volmode

Change-Id: I016cba4aba11d6e8574d4bc2d1f26284a068e562
---
 test/e2e/storage/testsuites/disruptive.go | 62 +++++++++++++----------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/test/e2e/storage/testsuites/disruptive.go b/test/e2e/storage/testsuites/disruptive.go
index f401e4e60e0e1..e63a5484d22c5 100644
--- a/test/e2e/storage/testsuites/disruptive.go
+++ b/test/e2e/storage/testsuites/disruptive.go
@@ -39,6 +39,10 @@ func InitDisruptiveTestSuite() TestSuite {
 			featureTag: "[Disruptive]",
 			testPatterns: []testpatterns.TestPattern{
 				// FSVolMode is already covered in subpath testsuite
+				testpatterns.DefaultFsInlineVolume,
+				testpatterns.FsVolModePreprovisionedPV,
+				testpatterns.FsVolModeDynamicPV,
+				testpatterns.BlockVolModePreprovisionedPV,
 				testpatterns.BlockVolModePreprovisionedPV,
 				testpatterns.BlockVolModeDynamicPV,
 			},
@@ -122,41 +126,43 @@ func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpattern
 			runTestBlock: utils.TestKubeletRestartsAndRestoresMap,
 		},
 		{
-			testItStmt:   "Should test that pv used in a pod that is deleted while the kubelet is down cleans up when the kubelet returns.",
-			runTestFile:  utils.TestVolumeUnmountsFromDeletedPod,
+			testItStmt: "Should test that pv used in a pod that is deleted while the kubelet is down cleans up when the kubelet returns.",
+			// File test is covered by subpath testsuite
 			runTestBlock: utils.TestVolumeUnmapsFromDeletedPod,
 		},
 		{
-			testItStmt:   "Should test that pv used in a pod that is force deleted while the kubelet is down cleans up when the kubelet returns.",
-			runTestFile:  utils.TestVolumeUnmountsFromForceDeletedPod,
+			testItStmt: "Should test that pv used in a pod that is force deleted while the kubelet is down cleans up when the kubelet returns.",
+			// File test is covered by subpath testsuite
 			runTestBlock: utils.TestVolumeUnmapsFromForceDeletedPod,
 		},
 	}
 
 	for _, test := range disruptiveTestTable {
-		func(t disruptiveTest) {
-			ginkgo.It(t.testItStmt, func() {
-				init()
-				defer cleanup()
-
-				var err error
-				var pvcs []*v1.PersistentVolumeClaim
-				var inlineSources []*v1.VolumeSource
-				if pattern.VolType == testpatterns.InlineVolume {
-					inlineSources = append(inlineSources, l.resource.volSource)
-				} else {
-					pvcs = append(pvcs, l.resource.pvc)
-				}
-				ginkgo.By("Creating a pod with pvc")
-				l.pod, err = framework.CreateSecPodWithNodeSelection(l.cs, l.ns.Name, pvcs, inlineSources, false, "", false, false, framework.SELinuxLabel, nil, framework.NodeSelection{Name: l.config.ClientNodeName}, framework.PodStartTimeout)
-				framework.ExpectNoError(err, "While creating pods for kubelet restart test")
-
-				if pattern.VolMode == v1.PersistentVolumeBlock {
-					t.runTestBlock(l.cs, l.config.Framework, l.pod)
-				} else {
-					t.runTestFile(l.cs, l.config.Framework, l.pod)
-				}
-			})
-		}(test)
+		if test.runTestFile != nil {
+			func(t disruptiveTest) {
+				ginkgo.It(t.testItStmt, func() {
+					init()
+					defer cleanup()
+
+					var err error
+					var pvcs []*v1.PersistentVolumeClaim
+					var inlineSources []*v1.VolumeSource
+					if pattern.VolType == testpatterns.InlineVolume {
+						inlineSources = append(inlineSources, l.resource.volSource)
+					} else {
+						pvcs = append(pvcs, l.resource.pvc)
+					}
+					ginkgo.By("Creating a pod with pvc")
+					l.pod, err = framework.CreateSecPodWithNodeSelection(l.cs, l.ns.Name, pvcs, inlineSources, false, "", false, false, framework.SELinuxLabel, nil, framework.NodeSelection{Name: l.config.ClientNodeName}, framework.PodStartTimeout)
+					framework.ExpectNoError(err, "While creating pods for kubelet restart test")
+
+					if pattern.VolMode == v1.PersistentVolumeBlock {
+						t.runTestBlock(l.cs, l.config.Framework, l.pod)
+					} else {
+						t.runTestFile(l.cs, l.config.Framework, l.pod)
+					}
+				})
+			}(test)
+		}
 	}
 }