Skip to content

Commit 8f5a62a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#77159 from draveness/feature/refactor-expect-no-errors
refactor: use framework.ExpectNoError instead in e2e tests
2 parents ebe3255 + 04bb797 commit 8f5a62a

File tree

13 files changed

+221
-225
lines changed

13 files changed

+221
-225
lines changed

‎test/e2e/apimachinery/resource_quota.go‎

Lines changed: 180 additions & 180 deletions
Large diffs are not rendered by default.

‎test/e2e/instrumentation/logging/elasticsearch/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ go_library(
2323
"//test/e2e/instrumentation/common:go_default_library",
2424
"//test/e2e/instrumentation/logging/utils:go_default_library",
2525
"//vendor/github.com/onsi/ginkgo:go_default_library",
26-
"//vendor/github.com/onsi/gomega:go_default_library",
2726
],
2827
)
2928

‎test/e2e/instrumentation/logging/elasticsearch/kibana.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
2727

2828
"github.com/onsi/ginkgo"
29-
"github.com/onsi/gomega"
3029
"k8s.io/apimachinery/pkg/util/wait"
3130
)
3231

@@ -67,17 +66,17 @@ func ClusterLevelLoggingWithKibana(f *framework.Framework) {
6766
}
6867
return true, nil
6968
})
70-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
69+
framework.ExpectNoError(err)
7170

7271
// Wait for the Kibana pod(s) to enter the running state.
7372
ginkgo.By("Checking to make sure the Kibana pods are running")
7473
label := labels.SelectorFromSet(labels.Set(map[string]string{kibanaKey: kibanaValue}))
7574
options := metav1.ListOptions{LabelSelector: label.String()}
7675
pods, err := f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).List(options)
77-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
76+
framework.ExpectNoError(err)
7877
for _, pod := range pods.Items {
7978
err = framework.WaitForPodRunningInNamespace(f.ClientSet, &pod)
80-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
79+
framework.ExpectNoError(err)
8180
}
8281

8382
ginkgo.By("Checking to make sure we get a response from the Kibana UI.")
@@ -101,5 +100,5 @@ func ClusterLevelLoggingWithKibana(f *framework.Framework) {
101100
}
102101
return true, nil
103102
})
104-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
103+
framework.ExpectNoError(err)
105104
}

‎test/e2e/kubectl/kubectl.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func runKubectlRetryOrDie(args ...string) string {
141141
// Expect no errors to be present after retries are finished
142142
// Copied from framework #ExecOrDie
143143
framework.Logf("stdout: %q", output)
144-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
144+
framework.ExpectNoError(err)
145145
return output
146146
}
147147

@@ -945,7 +945,7 @@ metadata:
945945
*/
946946
framework.ConformanceIt("should check if kubectl describe prints relevant information for rc and pods ", func() {
947947
kv, err := framework.KubectlVersion()
948-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
948+
framework.ExpectNoError(err)
949949
framework.SkipUnlessServerVersionGTE(kv, c.Discovery())
950950
controllerJSON := commonutils.SubstituteImageName(string(readTestFileOrDie(redisControllerFilename)))
951951
serviceJSON := readTestFileOrDie(redisServiceFilename)
@@ -1011,7 +1011,7 @@ metadata:
10111011
// Node
10121012
// It should be OK to list unschedulable Nodes here.
10131013
nodes, err := c.CoreV1().Nodes().List(metav1.ListOptions{})
1014-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1014+
framework.ExpectNoError(err)
10151015
node := nodes.Items[0]
10161016
output = framework.RunKubectlOrDie("describe", "node", node.Name)
10171017
requiredStrings = [][]string{
@@ -1100,10 +1100,10 @@ metadata:
11001100
}
11011101
return true, nil
11021102
})
1103-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1103+
framework.ExpectNoError(err)
11041104

11051105
service, err := c.CoreV1().Services(ns).Get(name, metav1.GetOptions{})
1106-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1106+
framework.ExpectNoError(err)
11071107

11081108
if len(service.Spec.Ports) != 1 {
11091109
framework.Failf("1 port is expected")
@@ -1247,7 +1247,7 @@ metadata:
12471247
forEachPod(func(pod v1.Pod) {
12481248
ginkgo.By("checking for a matching strings")
12491249
_, err := framework.LookForStringInLog(ns, pod.Name, containerName, "The server is now ready to accept connections", framework.PodStartTimeout)
1250-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1250+
framework.ExpectNoError(err)
12511251

12521252
ginkgo.By("limiting log lines")
12531253
out := framework.RunKubectlOrDie("log", pod.Name, containerName, nsFlag, "--tail=1")
@@ -1495,7 +1495,7 @@ metadata:
14951495
}
14961496
return true, nil
14971497
})
1498-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1498+
framework.ExpectNoError(err)
14991499
})
15001500

15011501
/*
@@ -1712,7 +1712,7 @@ metadata:
17121712
gomega.Expect(runOutput).To(gomega.ContainSubstring("stdin closed"))
17131713

17141714
err := jobutil.WaitForJobGone(c, ns, jobName, wait.ForeverTestTimeout)
1715-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1715+
framework.ExpectNoError(err)
17161716

17171717
ginkgo.By("verifying the job " + jobName + " was deleted")
17181718
_, err = c.BatchV1().Jobs(ns).Get(jobName, metav1.GetOptions{})
@@ -2073,7 +2073,7 @@ func validateGuestbookApp(c clientset.Interface, ns string) {
20732073
framework.Logf("Waiting for all frontend pods to be Running.")
20742074
label := labels.SelectorFromSet(labels.Set(map[string]string{"tier": "frontend", "app": "guestbook"}))
20752075
err := testutils.WaitForPodsWithLabelRunning(c, ns, label)
2076-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2076+
framework.ExpectNoError(err)
20772077
framework.Logf("Waiting for frontend to serve content.")
20782078
if !waitForGuestbookResponse(c, "get", "", `{"data": ""}`, guestbookStartupTimeout, ns) {
20792079
framework.Failf("Frontend service did not start serving content in %v seconds.", guestbookStartupTimeout.Seconds())
@@ -2158,7 +2158,7 @@ func forEachReplicationController(c clientset.Interface, ns, selectorKey, select
21582158
label := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue}))
21592159
options := metav1.ListOptions{LabelSelector: label.String()}
21602160
rcs, err = c.CoreV1().ReplicationControllers(ns).List(options)
2161-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2161+
framework.ExpectNoError(err)
21622162
if len(rcs.Items) > 0 {
21632163
break
21642164
}

‎test/e2e/servicecatalog/podpreset.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
7777
if errors.IsNotFound(err) {
7878
framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled")
7979
}
80-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
80+
framework.ExpectNoError(err)
8181

8282
ginkgo.By("creating the pod")
8383
name := "pod-preset-pod"
@@ -195,7 +195,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
195195
if errors.IsNotFound(err) {
196196
framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled")
197197
}
198-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
198+
framework.ExpectNoError(err)
199199

200200
ginkgo.By("creating the pod")
201201
name := "pod-preset-pod"

‎test/e2e/ui/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ go_library(
1616
"//test/e2e/framework:go_default_library",
1717
"//test/utils:go_default_library",
1818
"//vendor/github.com/onsi/ginkgo:go_default_library",
19-
"//vendor/github.com/onsi/gomega:go_default_library",
2019
],
2120
)
2221

‎test/e2e/ui/dashboard.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
testutils "k8s.io/kubernetes/test/utils"
3030

3131
"github.com/onsi/ginkgo"
32-
"github.com/onsi/gomega"
3332
)
3433

3534
var _ = SIGDescribe("Kubernetes Dashboard", func() {
@@ -52,12 +51,12 @@ var _ = SIGDescribe("Kubernetes Dashboard", func() {
5251
ginkgo.It("should check that the kubernetes-dashboard instance is alive", func() {
5352
ginkgo.By("Checking whether the kubernetes-dashboard service exists.")
5453
err := framework.WaitForService(f.ClientSet, uiNamespace, uiServiceName, true, framework.Poll, framework.ServiceStartTimeout)
55-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
54+
framework.ExpectNoError(err)
5655

5756
ginkgo.By("Checking to make sure the kubernetes-dashboard pods are running")
5857
selector := labels.SelectorFromSet(labels.Set(map[string]string{"k8s-app": uiAppName}))
5958
err = testutils.WaitForPodsWithLabelRunning(f.ClientSet, uiNamespace, selector)
60-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
59+
framework.ExpectNoError(err)
6160

6261
ginkgo.By("Checking to make sure we get a response from the kubernetes-dashboard.")
6362
err = wait.Poll(framework.Poll, serverStartTimeout, func() (bool, error) {
@@ -90,6 +89,6 @@ var _ = SIGDescribe("Kubernetes Dashboard", func() {
9089
// Don't return err here as it aborts polling.
9190
return status == http.StatusOK, nil
9291
})
93-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
92+
framework.ExpectNoError(err)
9493
})
9594
})

‎test/e2e/upgrades/cassandra.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (t *CassandraUpgradeTest) Setup(f *framework.Framework) {
9595
}
9696
return true, nil
9797
})
98-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
98+
framework.ExpectNoError(err)
9999
framework.Logf("Service endpoint is up")
100100

101101
ginkgo.By("Adding 2 dummy users")
@@ -105,7 +105,7 @@ func (t *CassandraUpgradeTest) Setup(f *framework.Framework) {
105105

106106
ginkgo.By("Verifying that the users exist")
107107
users, err := t.listUsers()
108-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
108+
framework.ExpectNoError(err)
109109
gomega.Expect(len(users)).To(gomega.Equal(2))
110110
}
111111

@@ -151,7 +151,7 @@ func (t *CassandraUpgradeTest) addUser(name string) error {
151151
// getServiceIP is a helper method to extract the Ingress IP from the service.
152152
func (t *CassandraUpgradeTest) getServiceIP(f *framework.Framework, ns, svcName string) string {
153153
svc, err := f.ClientSet.CoreV1().Services(ns).Get(svcName, metav1.GetOptions{})
154-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
154+
framework.ExpectNoError(err)
155155
ingress := svc.Status.LoadBalancer.Ingress
156156
if len(ingress) == 0 {
157157
return ""
@@ -212,6 +212,6 @@ func (t *CassandraUpgradeTest) Test(f *framework.Framework, done <-chan struct{}
212212
// Teardown does one final check of the data's availability.
213213
func (t *CassandraUpgradeTest) Teardown(f *framework.Framework) {
214214
users, err := t.listUsers()
215-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
215+
framework.ExpectNoError(err)
216216
gomega.Expect(len(users) >= t.successfulWrites).To(gomega.BeTrue())
217217
}

‎test/e2e/upgrades/etcd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (t *EtcdUpgradeTest) Setup(f *framework.Framework) {
9090
}
9191
return true, nil
9292
})
93-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
93+
framework.ExpectNoError(err)
9494
framework.Logf("Service endpoint is up")
9595

9696
ginkgo.By("Adding 2 dummy users")
@@ -100,7 +100,7 @@ func (t *EtcdUpgradeTest) Setup(f *framework.Framework) {
100100

101101
ginkgo.By("Verifying that the users exist")
102102
users, err := t.listUsers()
103-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
103+
framework.ExpectNoError(err)
104104
gomega.Expect(len(users)).To(gomega.Equal(2))
105105
}
106106

@@ -143,7 +143,7 @@ func (t *EtcdUpgradeTest) addUser(name string) error {
143143

144144
func (t *EtcdUpgradeTest) getServiceIP(f *framework.Framework, ns, svcName string) string {
145145
svc, err := f.ClientSet.CoreV1().Services(ns).Get(svcName, metav1.GetOptions{})
146-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
146+
framework.ExpectNoError(err)
147147
ingress := svc.Status.LoadBalancer.Ingress
148148
if len(ingress) == 0 {
149149
return ""
@@ -200,6 +200,6 @@ func (t *EtcdUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upg
200200
// Teardown does one final check of the data's availability.
201201
func (t *EtcdUpgradeTest) Teardown(f *framework.Framework) {
202202
users, err := t.listUsers()
203-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
203+
framework.ExpectNoError(err)
204204
gomega.Expect(len(users) >= t.successfulWrites).To(gomega.BeTrue())
205205
}

‎test/e2e/upgrades/mysql.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func mysqlKubectlCreate(ns, file string) {
6767

6868
func (t *MySQLUpgradeTest) getServiceIP(f *framework.Framework, ns, svcName string) string {
6969
svc, err := f.ClientSet.CoreV1().Services(ns).Get(svcName, metav1.GetOptions{})
70-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
70+
framework.ExpectNoError(err)
7171
ingress := svc.Status.LoadBalancer.Ingress
7272
if len(ingress) == 0 {
7373
return ""
@@ -105,7 +105,7 @@ func (t *MySQLUpgradeTest) Setup(f *framework.Framework) {
105105
}
106106
return true, nil
107107
})
108-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
108+
framework.ExpectNoError(err)
109109
framework.Logf("Service endpoint is up")
110110

111111
ginkgo.By("Adding 2 names to the database")
@@ -114,7 +114,7 @@ func (t *MySQLUpgradeTest) Setup(f *framework.Framework) {
114114

115115
ginkgo.By("Verifying that the 2 names have been inserted")
116116
count, err := t.countNames()
117-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
117+
framework.ExpectNoError(err)
118118
gomega.Expect(count).To(gomega.Equal(2))
119119
}
120120

@@ -166,7 +166,7 @@ func (t *MySQLUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, up
166166
// Teardown performs one final check of the data's availability.
167167
func (t *MySQLUpgradeTest) Teardown(f *framework.Framework) {
168168
count, err := t.countNames()
169-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
169+
framework.ExpectNoError(err)
170170
gomega.Expect(count >= t.successfulWrites).To(gomega.BeTrue())
171171
}
172172

0 commit comments

Comments
 (0)