Merge pull request #345 from chewong/deflake

test: deflake deployment test case
kubernetes-sigs · Apr 3, 2020 · 83b329a · 83b329a
2 parents 35ca3d2 + 43d2a75
commit 83b329a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -272,10 +272,10 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) {
 		}
 
 		podCheckCmd := []string{"cat", "/mnt/test-1/data"}
-		expectedString := "hello world\nhello world\n"
+		expectedString := "hello world\n"
 		if isWindowsCluster {
 			podCheckCmd = []string{"powershell.exe", "cat", "C:\\mnt\\test-1\\data.txt"}
-			expectedString = "hello world\r\nhello world\r\n"
+			expectedString = "hello world\r\n"
 		}
 		test := testsuites.DynamicallyProvisionedDeletePodTest{
 			CSIDriver: testDriver,

diff --git a/test/e2e/testsuites/dynamically_provisioned_delete_pod_tester.go b/test/e2e/testsuites/dynamically_provisioned_delete_pod_tester.go
@@ -51,6 +51,11 @@ func (t *DynamicallyProvisionedDeletePodTest) Run(client clientset.Interface, na
 	ginkgo.By("checking that the pod is running")
 	tDeployment.WaitForPodReady()
 
+	if t.PodCheck != nil {
+		ginkgo.By("checking pod exec")
+		tDeployment.Exec(t.PodCheck.Cmd, t.PodCheck.ExpectedString)
+	}
+
 	ginkgo.By("deleting the pod for deployment")
 	tDeployment.DeletePodAndWait()
 
@@ -59,6 +64,7 @@ func (t *DynamicallyProvisionedDeletePodTest) Run(client clientset.Interface, na
 
 	if t.PodCheck != nil {
 		ginkgo.By("checking pod exec")
-		tDeployment.Exec(t.PodCheck.Cmd, t.PodCheck.ExpectedString)
+		// pod will be restarted so expect to see 2 instances of string
+		tDeployment.Exec(t.PodCheck.Cmd, t.PodCheck.ExpectedString+t.PodCheck.ExpectedString)
 	}
 }