Move the pod setup outside of the mount test loop. (#1423)

Deleting pods with HVs takes some time, so let's do that separately.

test/integration/mount_test.go

@@ -49,7 +49,7 @@ func testMounting(t *testing.T) {
 	defer cmd.Process.Kill()
 
 	kubectlRunner := util.NewKubectlRunner(t)
-	podName := "busybox"
+	podName := "busybox-mount"
 	podPath, _ := filepath.Abs("testdata/busybox-mount-test.yaml")
 
 	// Write file in mounted dir from host
@@ -62,12 +62,23 @@ func testMounting(t *testing.T) {
 			t.Fatalf("Unexpected error while writing file %s: %s.", path, err)
 		}
 	}
-	mountTest := func() error {
+
+	// Create the pods we need outside the main test loop.
+	setupTest := func() error {
 		if _, err := kubectlRunner.RunCommand([]string{"create", "-f", podPath}); err != nil {
 			return err
 		}
-		defer kubectlRunner.RunCommand([]string{"delete", "-f", podPath})
+		return nil
+	}
+	defer kubectlRunner.RunCommand([]string{"delete", "-f", podPath})
 
+	if err := commonutil.RetryAfter(40, setupTest, 5*time.Second); err != nil {
+		t.Fatal("mountTest failed with error:", err)
+	}
+
+	mountTest := func() error {
+
+		// Wait for the pod to actually startup.
 		p := &api.Pod{}
 		for p.Status.Phase != "Running" {
 			p, err = kubectlRunner.GetPod(podName, "default")

test/integration/testdata/busybox-mount-test.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: busybox
+  name: busybox-mount
 spec:
   containers:
   - image: busybox:glibc