github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Remove deferred deletion calls from E2E tests

Browse Source
This commit is contained in:
Paul Morie 2016-09-30 11:22:37 -04:00
parent 714f816a34
commit 53ec6e60fe
11 changed files with 2 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/e2e/common/configmap.go
View File

@ -90,12 +90,6 @@ var _ = framework.KubeDescribe("ConfigMap", func() {
}
By(fmt.Sprintf("Creating configMap with name %s", configMap.Name))
defer func() {
By("Cleaning up the configMap")
if err := f.Client.ConfigMaps(f.Namespace.Name).Delete(configMap.Name); err != nil {
framework.Failf("unable to delete configMap %v: %v", configMap.Name, err)
}
}()
var err error
if configMap, err = f.Client.ConfigMaps(f.Namespace.Name).Create(configMap); err != nil {
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
@ -135,11 +129,6 @@ var _ = framework.KubeDescribe("ConfigMap", func() {
RestartPolicy: api.RestartPolicyNever,
},
}
defer func() {
By("Deleting the pod")
f.PodClient().Delete(pod.Name, api.NewDeleteOptions(0))
}()
By("Creating the pod")
f.PodClient().CreateSync(pod)
@ -163,12 +152,6 @@ var _ = framework.KubeDescribe("ConfigMap", func() {
name := "configmap-test-" + string(uuid.NewUUID())
configMap := newConfigMap(f, name)
By(fmt.Sprintf("Creating configMap %v/%v", f.Namespace.Name, configMap.Name))
defer func() {
By("Cleaning up the configMap")
if err := f.Client.ConfigMaps(f.Namespace.Name).Delete(configMap.Name); err != nil {
framework.Failf("unable to delete configMap %v: %v", configMap.Name, err)
}
}()
var err error
if configMap, err = f.Client.ConfigMaps(f.Namespace.Name).Create(configMap); err != nil {
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
@ -219,12 +202,6 @@ var _ = framework.KubeDescribe("ConfigMap", func() {
)
By(fmt.Sprintf("Creating configMap with name %s", configMap.Name))
defer func() {
By("Cleaning up the configMap")
if err := f.Client.ConfigMaps(f.Namespace.Name).Delete(configMap.Name); err != nil {
framework.Failf("unable to delete configMap %v: %v", configMap.Name, err)
}
}()
var err error
if configMap, err = f.Client.ConfigMaps(f.Namespace.Name).Create(configMap); err != nil {
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
@ -310,12 +287,6 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d
)
By(fmt.Sprintf("Creating configMap with name %s", configMap.Name))
defer func() {
By("Cleaning up the configMap")
if err := f.Client.ConfigMaps(f.Namespace.Name).Delete(configMap.Name); err != nil {
framework.Failf("unable to delete configMap %v: %v", configMap.Name, err)
}
}()
var err error
if configMap, err = f.Client.ConfigMaps(f.Namespace.Name).Create(configMap); err != nil {
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
@ -394,12 +365,7 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item
)
By(fmt.Sprintf("Creating configMap with name %s", configMap.Name))
defer func() {
By("Cleaning up the configMap")
if err := f.Client.ConfigMaps(f.Namespace.Name).Delete(configMap.Name); err != nil {
framework.Failf("unable to delete configMap %v: %v", configMap.Name, err)
}
}()
var err error
if configMap, err = f.Client.ConfigMaps(f.Namespace.Name).Create(configMap); err != nil {
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)

8
test/e2e/common/downwardapi_volume.go
View File

@ -89,10 +89,6 @@ var _ = framework.KubeDescribe("Downward API volume", func() {
podName := "labelsupdate" + string(uuid.NewUUID())
pod := downwardAPIVolumePodForUpdateTest(podName, labels, map[string]string{}, "/etc/labels")
containerName := "client-container"
defer func() {
By("Deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
By("Creating the pod")
podClient.CreateSync(pod)
@ -119,10 +115,6 @@ var _ = framework.KubeDescribe("Downward API volume", func() {
pod := downwardAPIVolumePodForUpdateTest(podName, map[string]string{}, annotations, "/etc/annotations")
containerName := "client-container"
defer func() {
By("Deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
By("Creating the pod")
podClient.CreateSync(pod)

5
test/e2e/common/init_container.go
View File

@ -76,7 +76,6 @@ var _ = framework.KubeDescribe("InitContainer", func() {
},
},
}
defer podClient.Delete(pod.Name, nil)
startedPod := podClient.Create(pod)
w, err := podClient.Watch(api.SingleObject(startedPod.ObjectMeta))
Expect(err).NotTo(HaveOccurred(), "error watching a pod")
@ -140,7 +139,6 @@ var _ = framework.KubeDescribe("InitContainer", func() {
},
},
}
defer podClient.Delete(pod.Name, nil)
startedPod := podClient.Create(pod)
w, err := podClient.Watch(api.SingleObject(startedPod.ObjectMeta))
Expect(err).NotTo(HaveOccurred(), "error watching a pod")
@ -204,7 +202,6 @@ var _ = framework.KubeDescribe("InitContainer", func() {
},
},
}
defer podClient.Delete(pod.Name, nil)
startedPod := podClient.Create(pod)
w, err := podClient.Watch(api.SingleObject(startedPod.ObjectMeta))
Expect(err).NotTo(HaveOccurred(), "error watching a pod")
@ -316,8 +313,8 @@ var _ = framework.KubeDescribe("InitContainer", func() {
},
},
}
defer podClient.Delete(pod.Name, nil)
startedPod := podClient.Create(pod)
w, err := podClient.Watch(api.SingleObject(startedPod.ObjectMeta))
Expect(err).NotTo(HaveOccurred(), "error watching a pod")

29
test/e2e/common/pods.go
View File

@ -48,7 +48,6 @@ var (
// testHostIP tests that a pod gets a host IP
func testHostIP(podClient *framework.PodClient, pod *api.Pod) {
By("creating pod")
defer podClient.Delete(pod.Name, api.NewDeleteOptions(0))
podClient.CreateSync(pod)
// Try to make sure we get a hostIP for each pod.
@ -179,10 +178,6 @@ var _ = framework.KubeDescribe("Pods", func() {
Expect(err).NotTo(HaveOccurred(), "failed to set up watch")
By("submitting the pod to kubernetes")
// We call defer here in case there is a problem with
// the test so we can ensure that we clean up after
// ourselves
defer podClient.Delete(pod.Name, api.NewDeleteOptions(0))
podClient.Create(pod)
By("verifying the pod is in kubernetes")
@ -288,10 +283,6 @@ var _ = framework.KubeDescribe("Pods", func() {
}
By("submitting the pod to kubernetes")
defer func() {
By("deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
pod = podClient.CreateSync(pod)
By("verifying the pod is in kubernetes")
@ -341,10 +332,6 @@ var _ = framework.KubeDescribe("Pods", func() {
}
By("submitting the pod to kubernetes")
defer func() {
By("deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
podClient.CreateSync(pod)
By("verifying the pod is in kubernetes")
@ -382,7 +369,6 @@ var _ = framework.KubeDescribe("Pods", func() {
},
},
}
defer podClient.Delete(serverPod.Name, api.NewDeleteOptions(0))
podClient.CreateSync(serverPod)
// This service exposes port 8080 of the test pod as a service on port 8765
@ -410,7 +396,6 @@ var _ = framework.KubeDescribe("Pods", func() {
},
},
}
defer f.Client.Services(f.Namespace.Name).Delete(svc.Name)
_, err := f.Client.Services(f.Namespace.Name).Create(svc)
Expect(err).NotTo(HaveOccurred(), "failed to create service")
@ -473,10 +458,6 @@ var _ = framework.KubeDescribe("Pods", func() {
}
By("submitting the pod to kubernetes")
defer func() {
By("deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
pod = podClient.CreateSync(pod)
req := f.Client.Get().
@ -601,11 +582,6 @@ var _ = framework.KubeDescribe("Pods", func() {
},
}
defer func() {
By("deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
delay1, delay2 := startPodAndGetBackOffs(podClient, pod, buildBackOffDuration)
By("updating the image")
@ -647,11 +623,6 @@ var _ = framework.KubeDescribe("Pods", func() {
},
}
defer func() {
By("deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
podClient.CreateSync(pod)
time.Sleep(2 * kubelet.MaxContainerBackOff) // it takes slightly more than 2*x to get to a back-off of x

18
test/e2e/common/secrets.go
View File

@ -46,12 +46,6 @@ var _ = framework.KubeDescribe("Secrets", func() {
secret := secretForTest(f.Namespace.Name, name)
By(fmt.Sprintf("Creating secret with name %s", secret.Name))
defer func() {
By("Cleaning up the secret")
if err := f.Client.Secrets(f.Namespace.Name).Delete(secret.Name); err != nil {
framework.Failf("unable to delete secret %v: %v", secret.Name, err)
}
}()
var err error
if secret, err = f.Client.Secrets(f.Namespace.Name).Create(secret); err != nil {
framework.Failf("unable to create test secret %s: %v", secret.Name, err)
@ -119,12 +113,6 @@ var _ = framework.KubeDescribe("Secrets", func() {
)
By(fmt.Sprintf("Creating secret with name %s", secret.Name))
defer func() {
By("Cleaning up the secret")
if err := f.Client.Secrets(f.Namespace.Name).Delete(secret.Name); err != nil {
framework.Failf("unable to delete secret %v: %v", secret.Name, err)
}
}()
var err error
if secret, err = f.Client.Secrets(f.Namespace.Name).Create(secret); err != nil {
framework.Failf("unable to create test secret %s: %v", secret.Name, err)
@ -189,12 +177,6 @@ var _ = framework.KubeDescribe("Secrets", func() {
secret := secretForTest(f.Namespace.Name, name)
By(fmt.Sprintf("Creating secret with name %s", secret.Name))
defer func() {
By("Cleaning up the secret")
if err := f.Client.Secrets(f.Namespace.Name).Delete(secret.Name); err != nil {
framework.Failf("unable to delete secret %v: %v", secret.Name, err)
}
}()
var err error
if secret, err = f.Client.Secrets(f.Namespace.Name).Create(secret); err != nil {
framework.Failf("unable to create test secret %s: %v", secret.Name, err)

1
test/e2e/common/sysctl.go
View File

@ -196,7 +196,6 @@ var _ = framework.KubeDescribe("Sysctls", func() {
By("Creating a pod with one valid and two invalid sysctls")
client := f.Client.Pods(f.Namespace.Name)
_, err := client.Create(pod)
defer client.Delete(pod.Name, nil)
Expect(err).NotTo(BeNil())
Expect(err.Error()).To(ContainSubstring(`Invalid value: "foo-"`))

2
test/e2e/framework/util.go
View File

@ -2145,7 +2145,6 @@ func (f *Framework) MatchContainerOutput(
podClient := f.PodClient()
ns := f.Namespace.Name
defer podClient.Delete(pod.Name, api.NewDeleteOptions(0))
podClient.Create(pod)
// Wait for client pod to complete.
@ -4320,7 +4319,6 @@ func CheckConnectivityToHost(f *Framework, nodeName, podName, host string, timeo
if err != nil {
return err
}
defer podClient.Delete(podName, nil)
err = WaitForPodSuccessInNamespace(f.Client, podName, f.Namespace.Name)
if err != nil {

8
test/e2e/generated_clientset.go
View File

@ -149,10 +149,6 @@ var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() {
if err != nil {
framework.Failf("Failed to create pod: %v", err)
}
// We call defer here in case there is a problem with
// the test so we can ensure that we clean up after
// ourselves
defer podClient.Delete(pod.Name, v1.NewDeleteOptions(0))
By("verifying the pod is in kubernetes")
options = v1.ListOptions{
@ -212,10 +208,6 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
if err != nil {
framework.Failf("Failed to create pod: %v", err)
}
// We call defer here in case there is a problem with
// the test so we can ensure that we clean up after
// ourselves
defer podClient.Delete(pod.Name, clientapi.NewDeleteOptions(0))
By("verifying the pod is in kubernetes")
timeout := 1 * time.Minute

6
test/e2e/proxy.go
View File

@ -105,12 +105,6 @@ func proxyContext(version string) {
},
})
Expect(err).NotTo(HaveOccurred())
defer func(name string) {
err := f.Client.Services(f.Namespace.Name).Delete(name)
if err != nil {
framework.Logf("Failed deleting service %v: %v", name, err)
}
}(service.Name)
// Make an RC with a single pod. The 'porter' image is
// a simple server which serves the values of the

2
test/e2e/security_context.go
View File

@ -171,7 +171,6 @@ func testPodSELinuxLabeling(f *framework.Framework, hostIPC bool, hostPID bool)
pod, err := client.Create(pod)
framework.ExpectNoError(err, "Error creating pod %v", pod)
defer client.Delete(pod.Name, nil)
framework.ExpectNoError(framework.WaitForPodRunningInNamespace(f.Client, pod))
testContent := "hello"
@ -226,7 +225,6 @@ func testPodSELinuxLabeling(f *framework.Framework, hostIPC bool, hostPID bool)
}
_, err = client.Create(pod)
framework.ExpectNoError(err, "Error creating pod %v", pod)
defer client.Delete(pod.Name, nil)
err = f.WaitForPodRunning(pod.Name)
framework.ExpectNoError(err, "Error waiting for pod to run %v", pod)

2
test/e2e/service_latency.go
View File

@ -127,7 +127,6 @@ func runServiceLatencies(f *framework.Framework, inParallel, total int) (output
if err := framework.RunRC(cfg); err != nil {
return nil, err
}
defer framework.DeleteRCAndPods(f.Client, f.ClientSet, f.Namespace.Name, cfg.Name)
// Run a single watcher, to reduce the number of API calls we have to
// make; this is to minimize the timing error. It's how kube-proxy
@ -331,7 +330,6 @@ func singleServiceLatency(f *framework.Framework, name string, q *endpointQuerie
return 0, err
}
framework.Logf("Created: %v", gotSvc.Name)
defer f.Client.Services(gotSvc.Namespace).Delete(gotSvc.Name)
if e := q.request(gotSvc.Name); e == nil {
return 0, fmt.Errorf("Never got a result for endpoint %v", gotSvc.Name)