Skip to content

Commit b7bc5dc

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#77692 from oomichi/use-ExpectNoError-common
Use framework.ExpectNoError() for e2e/common
2 parents 34aa283 + b9fffd1 commit b7bc5dc

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

‎test/e2e/common/pods.go‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func testHostIP(podClient *framework.PodClient, pod *v1.Pod) {
6767
t := time.Now()
6868
for {
6969
p, err := podClient.Get(pod.Name, metav1.GetOptions{})
70-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "Failed to get pod %q", pod.Name)
70+
framework.ExpectNoError(err, "Failed to get pod %q", pod.Name)
7171
if p.Status.HostIP != "" {
7272
e2elog.Logf("Pod %s has hostIP: %s", p.Name, p.Status.HostIP)
7373
break
@@ -218,7 +218,7 @@ var _ = framework.KubeDescribe("Pods", func() {
218218
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
219219
options := metav1.ListOptions{LabelSelector: selector.String()}
220220
pods, err := podClient.List(options)
221-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to query for pods")
221+
framework.ExpectNoError(err, "failed to query for pods")
222222
gomega.Expect(len(pods.Items)).To(gomega.Equal(0))
223223
options = metav1.ListOptions{
224224
LabelSelector: selector.String(),
@@ -256,7 +256,7 @@ var _ = framework.KubeDescribe("Pods", func() {
256256
selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
257257
options = metav1.ListOptions{LabelSelector: selector.String()}
258258
pods, err = podClient.List(options)
259-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to query for pods")
259+
framework.ExpectNoError(err, "failed to query for pods")
260260
gomega.Expect(len(pods.Items)).To(gomega.Equal(1))
261261

262262
ginkgo.By("verifying pod creation was observed")
@@ -279,11 +279,11 @@ var _ = framework.KubeDescribe("Pods", func() {
279279
framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
280280
// save the running pod
281281
pod, err = podClient.Get(pod.Name, metav1.GetOptions{})
282-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to GET scheduled pod")
282+
framework.ExpectNoError(err, "failed to GET scheduled pod")
283283

284284
ginkgo.By("deleting the pod gracefully")
285285
err = podClient.Delete(pod.Name, metav1.NewDeleteOptions(30))
286-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to delete pod")
286+
framework.ExpectNoError(err, "failed to delete pod")
287287

288288
ginkgo.By("verifying the kubelet observed the termination notice")
289289
gomega.Expect(wait.Poll(time.Second*5, time.Second*30, func() (bool, error) {
@@ -335,7 +335,7 @@ var _ = framework.KubeDescribe("Pods", func() {
335335
selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
336336
options = metav1.ListOptions{LabelSelector: selector.String()}
337337
pods, err = podClient.List(options)
338-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to query for pods")
338+
framework.ExpectNoError(err, "failed to query for pods")
339339
gomega.Expect(len(pods.Items)).To(gomega.Equal(0))
340340
})
341341

@@ -373,7 +373,7 @@ var _ = framework.KubeDescribe("Pods", func() {
373373
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
374374
options := metav1.ListOptions{LabelSelector: selector.String()}
375375
pods, err := podClient.List(options)
376-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to query for pods")
376+
framework.ExpectNoError(err, "failed to query for pods")
377377
gomega.Expect(len(pods.Items)).To(gomega.Equal(1))
378378

379379
ginkgo.By("updating the pod")
@@ -388,7 +388,7 @@ var _ = framework.KubeDescribe("Pods", func() {
388388
selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
389389
options = metav1.ListOptions{LabelSelector: selector.String()}
390390
pods, err = podClient.List(options)
391-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to query for pods")
391+
framework.ExpectNoError(err, "failed to query for pods")
392392
gomega.Expect(len(pods.Items)).To(gomega.Equal(1))
393393
e2elog.Logf("Pod update OK")
394394
})
@@ -427,7 +427,7 @@ var _ = framework.KubeDescribe("Pods", func() {
427427
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
428428
options := metav1.ListOptions{LabelSelector: selector.String()}
429429
pods, err := podClient.List(options)
430-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to query for pods")
430+
framework.ExpectNoError(err, "failed to query for pods")
431431
gomega.Expect(len(pods.Items)).To(gomega.Equal(1))
432432

433433
ginkgo.By("updating the pod")
@@ -491,7 +491,7 @@ var _ = framework.KubeDescribe("Pods", func() {
491491
},
492492
}
493493
_, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(svc)
494-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to create service")
494+
framework.ExpectNoError(err, "failed to create service")
495495

496496
// Make a client pod that verifies that it has the service environment variables.
497497
podName := "client-envvars-" + string(uuid.NewUUID())
@@ -538,7 +538,7 @@ var _ = framework.KubeDescribe("Pods", func() {
538538
*/
539539
framework.ConformanceIt("should support remote command execution over websockets [NodeConformance]", func() {
540540
config, err := framework.LoadConfig()
541-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "unable to get base config")
541+
framework.ExpectNoError(err, "unable to get base config")
542542

543543
ginkgo.By("creating the pod")
544544
name := "pod-exec-websocket-" + string(uuid.NewUUID())
@@ -620,7 +620,7 @@ var _ = framework.KubeDescribe("Pods", func() {
620620
*/
621621
framework.ConformanceIt("should support retrieving logs from the container over websockets [NodeConformance]", func() {
622622
config, err := framework.LoadConfig()
623-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "unable to get base config")
623+
framework.ExpectNoError(err, "unable to get base config")
624624

625625
ginkgo.By("creating the pod")
626626
name := "pod-logs-websocket-" + string(uuid.NewUUID())
@@ -798,14 +798,15 @@ var _ = framework.KubeDescribe("Pods", func() {
798798
}
799799

800800
validatePodReadiness := func(expectReady bool) {
801-
gomega.Expect(wait.Poll(time.Second, maxReadyStatusUpdateTolerance, func() (bool, error) {
801+
err := wait.Poll(time.Second, maxReadyStatusUpdateTolerance, func() (bool, error) {
802802
podReady := podClient.PodIsReady(podName)
803803
res := expectReady == podReady
804804
if !res {
805805
e2elog.Logf("Expect the Ready condition of pod %q to be %v, but got %v", podName, expectReady, podReady)
806806
}
807807
return res, nil
808-
})).NotTo(gomega.HaveOccurred())
808+
})
809+
framework.ExpectNoError(err)
809810
}
810811

811812
ginkgo.By("submitting the pod to kubernetes")

‎test/e2e/common/runtime.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ while true; do sleep 1; done
114114
Expect(terminateContainer.IsReady()).Should(Equal(testCase.Ready))
115115

116116
status, err := terminateContainer.GetStatus()
117-
Expect(err).ShouldNot(HaveOccurred())
117+
framework.ExpectNoError(err)
118118

119119
By(fmt.Sprintf("Container '%s': should get the expected 'State'", testContainer.Name))
120120
Expect(GetContainerState(status.State)).To(Equal(testCase.State))
@@ -148,7 +148,7 @@ while true; do sleep 1; done
148148

149149
By("get the container status")
150150
status, err := c.GetStatus()
151-
Expect(err).NotTo(HaveOccurred())
151+
framework.ExpectNoError(err)
152152

153153
By("the container should be terminated")
154154
Expect(GetContainerState(status.State)).To(Equal(ContainerStateTerminated))
@@ -286,7 +286,7 @@ while true; do sleep 1; done
286286
secret.Name = "image-pull-secret-" + string(uuid.NewUUID())
287287
By("create image pull secret")
288288
_, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(secret)
289-
Expect(err).NotTo(HaveOccurred())
289+
framework.ExpectNoError(err)
290290
defer f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Delete(secret.Name, nil)
291291
container.ImagePullSecrets = []string{secret.Name}
292292
}

‎test/e2e/common/sysctl.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,24 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() {
7777
// failed pods without running containers. This would create a race as the pod
7878
// might have already been deleted here.
7979
ev, err := f.PodClient().WaitForErrorEventOrSuccess(pod)
80-
Expect(err).NotTo(HaveOccurred())
80+
framework.ExpectNoError(err)
8181
if ev != nil && ev.Reason == sysctl.UnsupportedReason {
8282
framework.Skipf("No sysctl support in Docker <1.12")
8383
}
8484
Expect(ev).To(BeNil())
8585

8686
By("Waiting for pod completion")
8787
err = f.WaitForPodNoLongerRunning(pod.Name)
88-
Expect(err).NotTo(HaveOccurred())
88+
framework.ExpectNoError(err)
8989
pod, err = podClient.Get(pod.Name, metav1.GetOptions{})
90-
Expect(err).NotTo(HaveOccurred())
90+
framework.ExpectNoError(err)
9191

9292
By("Checking that the pod succeeded")
9393
Expect(pod.Status.Phase).To(Equal(v1.PodSucceeded))
9494

9595
By("Getting logs from the pod")
9696
log, err := framework.GetPodLogs(f.ClientSet, f.Namespace.Name, pod.Name, pod.Spec.Containers[0].Name)
97-
Expect(err).NotTo(HaveOccurred())
97+
framework.ExpectNoError(err)
9898

9999
By("Checking that the sysctl is actually updated")
100100
Expect(log).To(ContainSubstring("kernel.shm_rmid_forced = 1"))
@@ -120,24 +120,24 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() {
120120
// failed pods without running containers. This would create a race as the pod
121121
// might have already been deleted here.
122122
ev, err := f.PodClient().WaitForErrorEventOrSuccess(pod)
123-
Expect(err).NotTo(HaveOccurred())
123+
framework.ExpectNoError(err)
124124
if ev != nil && ev.Reason == sysctl.UnsupportedReason {
125125
framework.Skipf("No sysctl support in Docker <1.12")
126126
}
127127
Expect(ev).To(BeNil())
128128

129129
By("Waiting for pod completion")
130130
err = f.WaitForPodNoLongerRunning(pod.Name)
131-
Expect(err).NotTo(HaveOccurred())
131+
framework.ExpectNoError(err)
132132
pod, err = podClient.Get(pod.Name, metav1.GetOptions{})
133-
Expect(err).NotTo(HaveOccurred())
133+
framework.ExpectNoError(err)
134134

135135
By("Checking that the pod succeeded")
136136
Expect(pod.Status.Phase).To(Equal(v1.PodSucceeded))
137137

138138
By("Getting logs from the pod")
139139
log, err := framework.GetPodLogs(f.ClientSet, f.Namespace.Name, pod.Name, pod.Spec.Containers[0].Name)
140-
Expect(err).NotTo(HaveOccurred())
140+
framework.ExpectNoError(err)
141141

142142
By("Checking that the sysctl is actually updated")
143143
Expect(log).To(ContainSubstring("kernel.shm_rmid_forced = 1"))
@@ -197,7 +197,7 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() {
197197
// failed pods without running containers. This would create a race as the pod
198198
// might have already been deleted here.
199199
ev, err := f.PodClient().WaitForErrorEventOrSuccess(pod)
200-
Expect(err).NotTo(HaveOccurred())
200+
framework.ExpectNoError(err)
201201
if ev != nil && ev.Reason == sysctl.UnsupportedReason {
202202
framework.Skipf("No sysctl support in Docker <1.12")
203203
}

0 commit comments

Comments
 (0)