Skip to content

Commit d6c600d

Browse files
author
draveness
committed
fix: use framework.ExpectNoError instead of gomega
1 parent d8fd232 commit d6c600d

File tree

5 files changed

+34
-35
lines changed

5 files changed

+34
-35
lines changed

‎test/e2e/apimachinery/chunking.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
8181
for {
8282
opts.Limit = int64(rand.Int31n(numberOfTotalResources/10) + 1)
8383
list, err := client.List(opts)
84-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
84+
framework.ExpectNoError(err, "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
8585
e2elog.Logf("Retrieved %d/%d results with rv %s and continue %s", len(list.Items), opts.Limit, list.ResourceVersion, list.Continue)
8686
gomega.Expect(len(list.Items)).To(gomega.BeNumerically("<=", opts.Limit))
8787

@@ -110,7 +110,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
110110
ginkgo.By("retrieving those results all at once")
111111
opts := metav1.ListOptions{Limit: numberOfTotalResources + 1}
112112
list, err := client.List(opts)
113-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
113+
framework.ExpectNoError(err, "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
114114
gomega.Expect(list.Items).To(gomega.HaveLen(numberOfTotalResources))
115115
})
116116

@@ -124,7 +124,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
124124
opts := metav1.ListOptions{}
125125
opts.Limit = oneTenth
126126
list, err := client.List(opts)
127-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
127+
framework.ExpectNoError(err, "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
128128
firstToken := list.Continue
129129
firstRV := list.ResourceVersion
130130
if list.GetContinue() == "" {
@@ -163,7 +163,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
163163
ginkgo.By("retrieving the second page again with the token received with the error message")
164164
opts.Continue = inconsistentToken
165165
list, err = client.List(opts)
166-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given inconsistent continue token %s and limit: %d", ns, opts.Continue, opts.Limit)
166+
framework.ExpectNoError(err, "failed to list pod templates in namespace: %s, given inconsistent continue token %s and limit: %d", ns, opts.Continue, opts.Limit)
167167
gomega.Expect(list.ResourceVersion).ToNot(gomega.Equal(firstRV))
168168
gomega.Expect(len(list.Items)).To(gomega.BeNumerically("==", opts.Limit))
169169
found := int(oneTenth)
@@ -183,7 +183,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
183183
lastRV := list.ResourceVersion
184184
for {
185185
list, err := client.List(opts)
186-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
186+
framework.ExpectNoError(err, "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
187187
if list.GetContinue() == "" {
188188
gomega.Expect(list.GetRemainingItemCount()).To(gomega.BeNil())
189189
} else {

‎test/e2e/storage/drivers/in_tree.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -859,13 +859,13 @@ func (h *hostPathSymlinkDriver) CreateVolume(config *testsuites.PerTestConfig, v
859859
}
860860
// h.prepPod will be reused in cleanupDriver.
861861
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(prepPod)
862-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating hostPath init pod")
862+
framework.ExpectNoError(err, "while creating hostPath init pod")
863863

864864
err = framework.WaitForPodSuccessInNamespace(f.ClientSet, pod.Name, pod.Namespace)
865-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for hostPath init pod to succeed")
865+
framework.ExpectNoError(err, "while waiting for hostPath init pod to succeed")
866866

867867
err = framework.DeletePodWithWait(f, f.ClientSet, pod)
868-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while deleting hostPath init pod")
868+
framework.ExpectNoError(err, "while deleting hostPath init pod")
869869
return &hostPathSymlinkVolume{
870870
sourcePath: sourcePath,
871871
targetPath: targetPath,
@@ -881,13 +881,13 @@ func (v *hostPathSymlinkVolume) DeleteVolume() {
881881
v.prepPod.Spec.Containers[0].Command = []string{"/bin/sh", "-ec", cmd}
882882

883883
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(v.prepPod)
884-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating hostPath teardown pod")
884+
framework.ExpectNoError(err, "while creating hostPath teardown pod")
885885

886886
err = framework.WaitForPodSuccessInNamespace(f.ClientSet, pod.Name, pod.Namespace)
887-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for hostPath teardown pod to succeed")
887+
framework.ExpectNoError(err, "while waiting for hostPath teardown pod to succeed")
888888

889889
err = framework.DeletePodWithWait(f, f.ClientSet, pod)
890-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while deleting hostPath teardown pod")
890+
framework.ExpectNoError(err, "while deleting hostPath teardown pod")
891891
}
892892

893893
// emptydir

‎test/e2e/storage/regional_pd.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,13 @@ func testZonalFailover(c clientset.Interface, ns string) {
221221
pod := getPod(c, ns, regionalPDLabels)
222222
nodeName := pod.Spec.NodeName
223223
node, err := c.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{})
224-
gomega.Expect(err).ToNot(gomega.HaveOccurred())
224+
framework.ExpectNoError(err)
225225
podZone := node.Labels[v1.LabelZoneFailureDomain]
226226

227227
ginkgo.By("tainting nodes in the zone the pod is scheduled in")
228228
selector := labels.SelectorFromSet(labels.Set(map[string]string{v1.LabelZoneFailureDomain: podZone}))
229229
nodesInZone, err := c.CoreV1().Nodes().List(metav1.ListOptions{LabelSelector: selector.String()})
230-
gomega.Expect(err).ToNot(gomega.HaveOccurred())
230+
framework.ExpectNoError(err)
231231
removeTaintFunc := addTaint(c, ns, nodesInZone.Items, podZone)
232232

233233
defer func() {
@@ -305,13 +305,13 @@ func addTaint(c clientset.Interface, ns string, nodes []v1.Node, podZone string)
305305
reversePatches[node.Name] = reversePatchBytes
306306

307307
_, err = c.CoreV1().Nodes().Patch(node.Name, types.StrategicMergePatchType, patchBytes)
308-
gomega.Expect(err).ToNot(gomega.HaveOccurred())
308+
framework.ExpectNoError(err)
309309
}
310310

311311
return func() {
312312
for nodeName, reversePatch := range reversePatches {
313313
_, err := c.CoreV1().Nodes().Patch(nodeName, types.StrategicMergePatchType, reversePatch)
314-
gomega.Expect(err).ToNot(gomega.HaveOccurred())
314+
framework.ExpectNoError(err)
315315
}
316316
}
317317
}
@@ -534,7 +534,7 @@ func newPodTemplate(labels map[string]string) *v1.PodTemplateSpec {
534534

535535
func getTwoRandomZones(c clientset.Interface) []string {
536536
zones, err := framework.GetClusterZones(c)
537-
gomega.Expect(err).ToNot(gomega.HaveOccurred())
537+
framework.ExpectNoError(err)
538538
gomega.Expect(zones.Len()).To(gomega.BeNumerically(">=", 2),
539539
"The test should only be run in multizone clusters.")
540540

‎test/e2e/storage/testsuites/subpath.go‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"time"
3737

3838
"github.com/onsi/ginkgo"
39-
"github.com/onsi/gomega"
4039
)
4140

4241
var (
@@ -151,7 +150,7 @@ func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
151150
if l.pod != nil {
152151
ginkgo.By("Deleting pod")
153152
err := framework.DeletePodWithWait(f, f.ClientSet, l.pod)
154-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while deleting pod")
153+
framework.ExpectNoError(err, "while deleting pod")
155154
l.pod = nil
156155
}
157156

@@ -427,20 +426,20 @@ func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
427426
ginkgo.By(fmt.Sprintf("Creating pod %s", l.pod.Name))
428427
removeUnusedContainers(l.pod)
429428
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(l.pod)
430-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating pod")
429+
framework.ExpectNoError(err, "while creating pod")
431430
defer func() {
432431
ginkgo.By(fmt.Sprintf("Deleting pod %s", pod.Name))
433432
framework.DeletePodWithWait(f, f.ClientSet, pod)
434433
}()
435434

436435
// Wait for pod to be running
437436
err = framework.WaitForPodRunningInNamespace(f.ClientSet, l.pod)
438-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for pod to be running")
437+
framework.ExpectNoError(err, "while waiting for pod to be running")
439438

440439
// Exec into container that mounted the volume, delete subpath directory
441440
rmCmd := fmt.Sprintf("rm -r %s", l.subPathDir)
442441
_, err = podContainerExec(l.pod, 1, rmCmd)
443-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while removing subpath directory")
442+
framework.ExpectNoError(err, "while removing subpath directory")
444443

445444
// Delete pod (from defer) and wait for it to be successfully deleted
446445
})
@@ -713,7 +712,7 @@ func testPodFailSubpathError(f *framework.Framework, pod *v1.Pod, errorMsg strin
713712
ginkgo.By(fmt.Sprintf("Creating pod %s", pod.Name))
714713
removeUnusedContainers(pod)
715714
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
716-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating pod")
715+
framework.ExpectNoError(err, "while creating pod")
717716
defer func() {
718717
framework.DeletePodWithWait(f, f.ClientSet, pod)
719718
}()
@@ -792,17 +791,17 @@ func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
792791
ginkgo.By(fmt.Sprintf("Creating pod %s", pod.Name))
793792
removeUnusedContainers(pod)
794793
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
795-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating pod")
794+
framework.ExpectNoError(err, "while creating pod")
796795
defer func() {
797796
framework.DeletePodWithWait(f, f.ClientSet, pod)
798797
}()
799798
err = framework.WaitForPodRunningInNamespace(f.ClientSet, pod)
800-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for pod to be running")
799+
framework.ExpectNoError(err, "while waiting for pod to be running")
801800

802801
ginkgo.By("Failing liveness probe")
803802
out, err := podContainerExec(pod, 1, fmt.Sprintf("rm %v", probeFilePath))
804803
e2elog.Logf("Pod exec output: %v", out)
805-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while failing liveness probe")
804+
framework.ExpectNoError(err, "while failing liveness probe")
806805

807806
// Check that container has restarted
808807
ginkgo.By("Waiting for container to restart")
@@ -824,7 +823,7 @@ func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
824823
}
825824
return false, nil
826825
})
827-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for container to restart")
826+
framework.ExpectNoError(err, "while waiting for container to restart")
828827

829828
// Fix liveness probe
830829
ginkgo.By("Rewriting the file")
@@ -836,7 +835,7 @@ func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
836835
}
837836
out, err = podContainerExec(pod, 1, writeCmd)
838837
e2elog.Logf("Pod exec output: %v", out)
839-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while rewriting the probe file")
838+
framework.ExpectNoError(err, "while rewriting the probe file")
840839

841840
// Wait for container restarts to stabilize
842841
ginkgo.By("Waiting for container to stop restarting")
@@ -865,7 +864,7 @@ func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
865864
}
866865
return false, nil
867866
})
868-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for container to stabilize")
867+
framework.ExpectNoError(err, "while waiting for container to stabilize")
869868
}
870869

871870
func testSubpathReconstruction(f *framework.Framework, pod *v1.Pod, forceDelete bool) {
@@ -885,27 +884,27 @@ func testSubpathReconstruction(f *framework.Framework, pod *v1.Pod, forceDelete
885884
ginkgo.By(fmt.Sprintf("Creating pod %s", pod.Name))
886885
removeUnusedContainers(pod)
887886
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
888-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating pod")
887+
framework.ExpectNoError(err, "while creating pod")
889888

890889
err = framework.WaitForPodRunningInNamespace(f.ClientSet, pod)
891-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for pod to be running")
890+
framework.ExpectNoError(err, "while waiting for pod to be running")
892891

893892
pod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(pod.Name, metav1.GetOptions{})
894-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while getting pod")
893+
framework.ExpectNoError(err, "while getting pod")
895894

896895
utils.TestVolumeUnmountsFromDeletedPodWithForceOption(f.ClientSet, f, pod, forceDelete, true)
897896
}
898897

899898
func formatVolume(f *framework.Framework, pod *v1.Pod) {
900899
ginkgo.By(fmt.Sprintf("Creating pod to format volume %s", pod.Name))
901900
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
902-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while creating volume init pod")
901+
framework.ExpectNoError(err, "while creating volume init pod")
903902

904903
err = framework.WaitForPodSuccessInNamespace(f.ClientSet, pod.Name, pod.Namespace)
905-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while waiting for volume init pod to succeed")
904+
framework.ExpectNoError(err, "while waiting for volume init pod to succeed")
906905

907906
err = framework.DeletePodWithWait(f, f.ClientSet, pod)
908-
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "while deleting volume init pod")
907+
framework.ExpectNoError(err, "while deleting volume init pod")
909908
}
910909

911910
func podContainerExec(pod *v1.Pod, containerIndex int, command string) (string, error) {

‎test/e2e/storage/volume_provisioning.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ func deleteProvisionedVolumesAndDisks(c clientset.Interface, pvs []*v1.Persisten
12301230

12311231
func getRandomClusterZone(c clientset.Interface) string {
12321232
zones, err := framework.GetClusterZones(c)
1233-
gomega.Expect(err).ToNot(gomega.HaveOccurred())
1233+
framework.ExpectNoError(err)
12341234
gomega.Expect(len(zones)).ToNot(gomega.Equal(0))
12351235

12361236
zonesList := zones.UnsortedList()

0 commit comments

Comments
 (0)