Merge pull request #230 from chewong/deflake

test: deflake deployment test case

test/e2e/dynamic_provisioning_test.go

@@ -189,10 +189,10 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
 		}
 
 		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,
@@ -438,7 +438,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
 			Pod:       pod,
 			PodCheck: &testsuites.PodExecCheck{
 				Cmd:            []string{"cat", "/mnt/test-1/data"},
-				ExpectedString: "hello world\nhello world\n", // pod will be restarted so expect to see 2 instances of string
+				ExpectedString: "hello world\n",
 			},
 			StorageClassParameters: map[string]string{"skuName": "Standard_LRS", "fsType": "xfs"},
 		}

test/e2e/testsuites/dynamically_provisioned_delete_pod_tester.go

@@ -52,6 +52,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()
 
@@ -60,6 +65,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)
 	}
 }