From c4b14e0eaaf85016405b570ff90bee4e4e1957b2 Mon Sep 17 00:00:00 2001
From: Jeff Vance <jvance@redhat.com>
Date: Tue, 4 Apr 2017 14:17:47 -0700
Subject: [PATCH] rebase-1

---
 test/e2e/framework/pv_util.go | 25 +------------------------
 test/e2e/kubelet.go           | 14 +-------------
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/test/e2e/framework/pv_util.go b/test/e2e/framework/pv_util.go
index 88d128454fc..4b7515c2784 100644
--- a/test/e2e/framework/pv_util.go
+++ b/test/e2e/framework/pv_util.go
@@ -421,25 +421,6 @@ func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) {
 	Logf("Pod %q successfully deleted", pod.Name)
 }
 
-// Create the test pod, wait for success, and then delete the pod.
-func CreateWaitAndDeletePod(f *Framework, c clientset.Interface, ns string, claimName string) {
-
-	Logf("Creating nfs test pod")
-
-	// Make pod spec
-	pod := MakeWritePod(ns, claimName)
-
-	// Instantiate pod (Create)
-	runPod, err := c.CoreV1().Pods(ns).Create(pod)
-	Expect(err).NotTo(HaveOccurred())
-	Expect(runPod).NotTo(BeNil())
-
-	defer DeletePodWithWait(f, c, runPod)
-
-	// Wait for the test pod to complete its lifecycle
-	testPodSuccessOrFail(c, ns, runPod)
-}
-
 // Sanity check for GCE testing.  Verify the persistent disk attached to the node.
 func VerifyGCEDiskAttached(diskName string, nodeName types.NodeName) bool {
 	gceCloud, err := GetGCECloud()
@@ -634,17 +615,13 @@ func deletePD(pdName string) error {
 	}
 }
 
-// Create the test pod, wait for (hopefully) success, and then delete the pod.
+// Create the test pod, wait for success, and then delete the pod.
 func CreateWaitAndDeletePod(f *Framework, c clientset.Interface, ns string, pvc *v1.PersistentVolumeClaim) {
 	Logf("Creating nfs test pod")
-	// Make pod spec
 	pod := MakeWritePod(ns, pvc)
-
-	// Instantiate pod (Create)
 	runPod, err := c.CoreV1().Pods(ns).Create(pod)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(runPod).NotTo(BeNil())
-
 	defer DeletePodWithWait(f, c, runPod)
 
 	// Wait for the test pod to complete its lifecycle
diff --git a/test/e2e/kubelet.go b/test/e2e/kubelet.go
index 06c6ea41f7b..8bbc2445e49 100644
--- a/test/e2e/kubelet.go
+++ b/test/e2e/kubelet.go
@@ -453,25 +453,13 @@ var _ = framework.KubeDescribe("kubelet", func() {
 			}
 
 			BeforeEach(func() {
-<<<<<<< HEAD
+				framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
 				NFSconfig = framework.VolumeTestConfig{
 					Namespace:   ns,
 					Prefix:      "nfs",
 					ServerImage: framework.NfsServerImage,
 					ServerPorts: []int{2049},
 					ServerArgs:  []string{"-G", "777", "/exports"},
-=======
-				framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
-				// TODO: delete after pr #33447 is merged
-				framework.SkipIfProviderIs("gke")
-
-				NFSconfig = VolumeTestConfig{
-					namespace:   ns,
-					prefix:      "nfs",
-					serverImage: NfsServerImage,
-					serverPorts: []int{2049},
-					serverArgs:  []string{"-G", "777", "/exports"},
->>>>>>> add disruptive tests to verify host clean up. Issues: #31272, #37657.
 				}
 				nfsServerPod, nfsIP = createNfsServerPod(c, NFSconfig)
 			})