Skip to content

Commit 629ec7e

Browse files
danielqsjdanielqsj
committed
replace test error checking with more readable way
1 parent 1058877 commit 629ec7e

File tree

8 files changed

+24
-25
lines changed

8 files changed

+24
-25
lines changed

‎test/e2e/storage/persistent_volumes-local.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,9 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
313313
ginkgo.By("Creating local PVC and PV")
314314
createLocalPVCsPVs(config, []*localTestVolume{testVol}, immediateMode)
315315
pod, err := createLocalPod(config, testVol, nil)
316-
gomega.Expect(err).To(gomega.HaveOccurred())
316+
framework.ExpectError(err)
317317
err = framework.WaitTimeoutForPodRunningInNamespace(config.client, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
318-
gomega.Expect(err).To(gomega.HaveOccurred())
318+
framework.ExpectError(err)
319319
cleanupLocalPVCsPVs(config, []*localTestVolume{testVol})
320320
})
321321

@@ -332,7 +332,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
332332
framework.ExpectNoError(err)
333333

334334
err = framework.WaitTimeoutForPodRunningInNamespace(config.client, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
335-
gomega.Expect(err).To(gomega.HaveOccurred())
335+
framework.ExpectError(err)
336336

337337
cleanupLocalVolumes(config, []*localTestVolume{testVol})
338338
})
@@ -932,7 +932,7 @@ func createLocalPVCsPVs(config *localTestConfig, volumes []*localTestVolume, mod
932932
}
933933
return false, nil
934934
})
935-
gomega.Expect(err).To(gomega.HaveOccurred())
935+
framework.ExpectError(err)
936936
}
937937
}
938938

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
193193
defer func() {
194194
framework.ExpectNoError(framework.DeletePodWithWait(f, l.cs, pod))
195195
}()
196-
gomega.Expect(err).To(gomega.HaveOccurred())
196+
framework.ExpectError(err)
197197
})
198198
} else {
199199
ginkgo.It("should create sc, pod, pv, and pvc, read/write to the pv, and delete all created resources", func() {
@@ -251,7 +251,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
251251
framework.ExpectNoError(err)
252252

253253
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, l.cs, l.pvc.Namespace, l.pvc.Name, framework.Poll, framework.ClaimProvisionTimeout)
254-
gomega.Expect(err).To(gomega.HaveOccurred())
254+
framework.ExpectError(err)
255255
})
256256
} else {
257257
ginkgo.It("should create sc, pod, pv, and pvc, read/write to the pv, and delete all created resources", func() {

‎test/e2e/storage/volume_metrics.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
175175
framework.ExpectNoError(err, "failed to create Pod %s/%s", pod.Namespace, pod.Name)
176176

177177
err = framework.WaitTimeoutForPodRunningInNamespace(c, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
178-
gomega.Expect(err).To(gomega.HaveOccurred())
178+
framework.ExpectError(err)
179179

180180
e2elog.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name)
181181
framework.ExpectNoError(framework.DeletePodWithWait(f, c, pod))

‎test/e2e/storage/volume_provisioning.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
573573

574574
// The claim should timeout phase:Pending
575575
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, c, ns, pvc.Name, 2*time.Second, framework.ClaimProvisionShortTimeout)
576-
gomega.Expect(err).To(gomega.HaveOccurred())
576+
framework.ExpectError(err)
577577
e2elog.Logf(err.Error())
578578
})
579579

@@ -800,7 +800,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
800800

801801
// The claim should timeout phase:Pending
802802
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, c, ns, claim.Name, 2*time.Second, framework.ClaimProvisionShortTimeout)
803-
gomega.Expect(err).To(gomega.HaveOccurred())
803+
framework.ExpectError(err)
804804
e2elog.Logf(err.Error())
805805
claim, err = c.CoreV1().PersistentVolumeClaims(ns).Get(claim.Name, metav1.GetOptions{})
806806
framework.ExpectNoError(err)
@@ -834,7 +834,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
834834

835835
// The claim should timeout phase:Pending
836836
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, c, ns, claim.Name, 2*time.Second, framework.ClaimProvisionShortTimeout)
837-
gomega.Expect(err).To(gomega.HaveOccurred())
837+
framework.ExpectError(err)
838838
e2elog.Logf(err.Error())
839839
claim, err = c.CoreV1().PersistentVolumeClaims(ns).Get(claim.Name, metav1.GetOptions{})
840840
framework.ExpectNoError(err)

‎test/e2e/storage/vsphere/vsphere_volume_datastore.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"time"
2323

2424
"github.com/onsi/ginkgo"
25-
"github.com/onsi/gomega"
2625
"k8s.io/api/core/v1"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
clientset "k8s.io/client-go/kubernetes"
@@ -69,7 +68,7 @@ var _ = utils.SIGDescribe("Volume Provisioning on Datastore [Feature:vsphere]",
6968
scParameters[Datastore] = InvalidDatastore
7069
scParameters[DiskFormat] = ThinDisk
7170
err := invokeInvalidDatastoreTestNeg(client, namespace, scParameters)
72-
gomega.Expect(err).To(gomega.HaveOccurred())
71+
framework.ExpectError(err)
7372
errorMsg := `Failed to provision volume with StorageClass \"` + DatastoreSCName + `\": Datastore ` + InvalidDatastore + ` not found`
7473
if !strings.Contains(err.Error(), errorMsg) {
7574
framework.ExpectNoError(err, errorMsg)
@@ -90,7 +89,7 @@ func invokeInvalidDatastoreTestNeg(client clientset.Interface, namespace string,
9089

9190
ginkgo.By("Expect claim to fail provisioning volume")
9291
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, client, pvclaim.Namespace, pvclaim.Name, framework.Poll, 2*time.Minute)
93-
gomega.Expect(err).To(gomega.HaveOccurred())
92+
framework.ExpectError(err)
9493

9594
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
9695
return fmt.Errorf("Failure message: %+q", eventList.Items[0].Message)

‎test/e2e/storage/vsphere/vsphere_volume_fstype.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func invokeTestForInvalidFstype(f *framework.Framework, client clientset.Interfa
126126
pvclaims = append(pvclaims, pvclaim)
127127
// Create pod to attach Volume to Node
128128
pod, err := framework.CreatePod(client, namespace, nil, pvclaims, false, ExecCommand)
129-
gomega.Expect(err).To(gomega.HaveOccurred())
129+
framework.ExpectError(err)
130130

131131
eventList, err := client.CoreV1().Events(namespace).List(metav1.ListOptions{})
132132

‎test/e2e/storage/vsphere/vsphere_volume_vsan_policy.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
159159
scParameters[Policy_DiskStripes] = StripeWidthCapabilityVal
160160
e2elog.Logf("Invoking test for VSAN storage capabilities: %+v", scParameters)
161161
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
162-
gomega.Expect(err).To(gomega.HaveOccurred())
162+
framework.ExpectError(err)
163163
errorMsg := "invalid option \\\"objectSpaceReserve\\\" for volume plugin kubernetes.io/vsphere-volume"
164164
if !strings.Contains(err.Error(), errorMsg) {
165165
framework.ExpectNoError(err, errorMsg)
@@ -174,7 +174,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
174174
scParameters[Policy_CacheReservation] = CacheReservationCapabilityVal
175175
e2elog.Logf("Invoking test for VSAN storage capabilities: %+v", scParameters)
176176
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
177-
gomega.Expect(err).To(gomega.HaveOccurred())
177+
framework.ExpectError(err)
178178
errorMsg := "Invalid value for " + Policy_DiskStripes + "."
179179
if !strings.Contains(err.Error(), errorMsg) {
180180
framework.ExpectNoError(err, errorMsg)
@@ -188,7 +188,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
188188
scParameters[Policy_HostFailuresToTolerate] = HostFailuresToTolerateCapabilityInvalidVal
189189
e2elog.Logf("Invoking test for VSAN storage capabilities: %+v", scParameters)
190190
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
191-
gomega.Expect(err).To(gomega.HaveOccurred())
191+
framework.ExpectError(err)
192192
errorMsg := "Invalid value for " + Policy_HostFailuresToTolerate + "."
193193
if !strings.Contains(err.Error(), errorMsg) {
194194
framework.ExpectNoError(err, errorMsg)
@@ -204,7 +204,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
204204
scParameters[Datastore] = VmfsDatastore
205205
e2elog.Logf("Invoking test for VSAN storage capabilities: %+v", scParameters)
206206
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
207-
gomega.Expect(err).To(gomega.HaveOccurred())
207+
framework.ExpectError(err)
208208
errorMsg := "The specified datastore: \\\"" + VmfsDatastore + "\\\" is not a VSAN datastore. " +
209209
"The policy parameters will work only with VSAN Datastore."
210210
if !strings.Contains(err.Error(), errorMsg) {
@@ -236,7 +236,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
236236
scParameters[DiskFormat] = ThinDisk
237237
e2elog.Logf("Invoking test for SPBM storage policy on a non-compatible datastore: %+v", scParameters)
238238
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
239-
gomega.Expect(err).To(gomega.HaveOccurred())
239+
framework.ExpectError(err)
240240
errorMsg := "User specified datastore is not compatible with the storagePolicy: \\\"" + tagPolicy + "\\\""
241241
if !strings.Contains(err.Error(), errorMsg) {
242242
framework.ExpectNoError(err, errorMsg)
@@ -249,7 +249,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
249249
scParameters[DiskFormat] = ThinDisk
250250
e2elog.Logf("Invoking test for non-existing SPBM storage policy: %+v", scParameters)
251251
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
252-
gomega.Expect(err).To(gomega.HaveOccurred())
252+
framework.ExpectError(err)
253253
errorMsg := "no pbm profile found with name: \\\"" + BronzeStoragePolicy + "\\"
254254
if !strings.Contains(err.Error(), errorMsg) {
255255
framework.ExpectNoError(err, errorMsg)
@@ -264,7 +264,7 @@ var _ = utils.SIGDescribe("Storage Policy Based Volume Provisioning [Feature:vsp
264264
scParameters[DiskFormat] = ThinDisk
265265
e2elog.Logf("Invoking test for SPBM storage policy and VSAN capabilities together: %+v", scParameters)
266266
err := invokeInvalidPolicyTestNeg(client, namespace, scParameters)
267-
gomega.Expect(err).To(gomega.HaveOccurred())
267+
framework.ExpectError(err)
268268
errorMsg := "Cannot specify storage policy capabilities along with storage policy name. Please specify only one"
269269
if !strings.Contains(err.Error(), errorMsg) {
270270
framework.ExpectNoError(err, errorMsg)
@@ -317,7 +317,7 @@ func invokeInvalidPolicyTestNeg(client clientset.Interface, namespace string, sc
317317

318318
ginkgo.By("Waiting for claim to be in bound phase")
319319
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, client, pvclaim.Namespace, pvclaim.Name, framework.Poll, 2*time.Minute)
320-
gomega.Expect(err).To(gomega.HaveOccurred())
320+
framework.ExpectError(err)
321321

322322
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
323323
return fmt.Errorf("Failure message: %+q", eventList.Items[0].Message)
@@ -337,7 +337,7 @@ func invokeStaleDummyVMTestWithStoragePolicy(client clientset.Interface, masterN
337337
pvclaims = append(pvclaims, pvclaim)
338338
ginkgo.By("Expect claim to fail provisioning volume")
339339
_, err = framework.WaitForPVClaimBoundPhase(client, pvclaims, 2*time.Minute)
340-
gomega.Expect(err).To(gomega.HaveOccurred())
340+
framework.ExpectError(err)
341341

342342
updatedClaim, err := client.CoreV1().PersistentVolumeClaims(namespace).Get(pvclaim.Name, metav1.GetOptions{})
343343
framework.ExpectNoError(err)

‎test/e2e/storage/vsphere/vsphere_zone_support.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ var _ = utils.SIGDescribe("Zone Support", func() {
132132
ginkgo.By(fmt.Sprintf("Creating storage class with unknown zone : %s", zoneD))
133133
zones = append(zones, zoneD)
134134
err := verifyPVCCreationFails(client, namespace, nil, zones)
135-
gomega.Expect(err).To(gomega.HaveOccurred())
135+
framework.ExpectError(err)
136136
errorMsg := "Failed to find a shared datastore matching zone [" + zoneD + "]"
137137
if !strings.Contains(err.Error(), errorMsg) {
138138
framework.ExpectNoError(err, errorMsg)
@@ -357,7 +357,7 @@ func verifyPVCCreationFails(client clientset.Interface, namespace string, scPara
357357

358358
ginkgo.By("Waiting for claim to be in bound phase")
359359
err = framework.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, client, pvclaim.Namespace, pvclaim.Name, framework.Poll, 2*time.Minute)
360-
gomega.Expect(err).To(gomega.HaveOccurred())
360+
framework.ExpectError(err)
361361

362362
eventList, err := client.CoreV1().Events(pvclaim.Namespace).List(metav1.ListOptions{})
363363
e2elog.Logf("Failure message : %+q", eventList.Items[0].Message)

0 commit comments

Comments
 (0)