github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

rebase-1

Browse Source
This commit is contained in:
Jeff Vance 2017-04-04 14:17:47 -07:00
parent a192edd87f
commit c4b14e0eaa
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/framework/pv_util.go
View File

@ -421,25 +421,6 @@ func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) {
Logf("Pod %q successfully deleted", pod.Name) 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. // Sanity check for GCE testing. Verify the persistent disk attached to the node.
func VerifyGCEDiskAttached(diskName string, nodeName types.NodeName) bool { func VerifyGCEDiskAttached(diskName string, nodeName types.NodeName) bool {
gceCloud, err := GetGCECloud() 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) { func CreateWaitAndDeletePod(f *Framework, c clientset.Interface, ns string, pvc *v1.PersistentVolumeClaim) {
Logf("Creating nfs test pod") Logf("Creating nfs test pod")
// Make pod spec
pod := MakeWritePod(ns, pvc) pod := MakeWritePod(ns, pvc)
// Instantiate pod (Create)
runPod, err := c.CoreV1().Pods(ns).Create(pod) runPod, err := c.CoreV1().Pods(ns).Create(pod)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(runPod).NotTo(BeNil()) Expect(runPod).NotTo(BeNil())
defer DeletePodWithWait(f, c, runPod) defer DeletePodWithWait(f, c, runPod)
// Wait for the test pod to complete its lifecycle // Wait for the test pod to complete its lifecycle

14
test/e2e/kubelet.go
View File

@ -453,25 +453,13 @@ var _ = framework.KubeDescribe("kubelet", func() {
} }
BeforeEach(func() { BeforeEach(func() {
<<<<<<< HEAD framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
NFSconfig = framework.VolumeTestConfig{ NFSconfig = framework.VolumeTestConfig{
Namespace: ns, Namespace: ns,
Prefix: "nfs", Prefix: "nfs",
ServerImage: framework.NfsServerImage, ServerImage: framework.NfsServerImage,
ServerPorts: []int{2049}, ServerPorts: []int{2049},
ServerArgs: []string{"-G", "777", "/exports"}, 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) nfsServerPod, nfsIP = createNfsServerPod(c, NFSconfig)
}) })