mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #74314 from oomichi/add-ExpectError
Add ExpectError() to e2e test framework
This commit is contained in:
commit
b27fe7f4b9
@ -2039,6 +2039,11 @@ func RandomSuffix() string {
|
|||||||
return strconv.Itoa(r.Int() % 10000)
|
return strconv.Itoa(r.Int() % 10000)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ExpectError expects an error happens, otherwise an exception raises
|
||||||
|
func ExpectError(err error, explain ...interface{}) {
|
||||||
|
gomega.Expect(err).To(gomega.HaveOccurred(), explain...)
|
||||||
|
}
|
||||||
|
|
||||||
// ExpectNoError checks if "err" is set, and if so, fails assertion while logging the error.
|
// ExpectNoError checks if "err" is set, and if so, fails assertion while logging the error.
|
||||||
func ExpectNoError(err error, explain ...interface{}) {
|
func ExpectNoError(err error, explain ...interface{}) {
|
||||||
ExpectNoErrorWithOffset(1, err, explain...)
|
ExpectNoErrorWithOffset(1, err, explain...)
|
||||||
|
@ -483,7 +483,7 @@ func (t StorageClassTest) TestBindingWaitForFirstConsumerMultiPVC(claims []*v1.P
|
|||||||
// Wait for ClaimProvisionTimeout (across all PVCs in parallel) and make sure the phase did not become Bound i.e. the Wait errors out
|
// Wait for ClaimProvisionTimeout (across all PVCs in parallel) and make sure the phase did not become Bound i.e. the Wait errors out
|
||||||
By("checking the claims are in pending state")
|
By("checking the claims are in pending state")
|
||||||
err = framework.WaitForPersistentVolumeClaimsPhase(v1.ClaimBound, t.Client, namespace, claimNames, 2*time.Second /* Poll */, framework.ClaimProvisionShortTimeout, true)
|
err = framework.WaitForPersistentVolumeClaimsPhase(v1.ClaimBound, t.Client, namespace, claimNames, 2*time.Second /* Poll */, framework.ClaimProvisionShortTimeout, true)
|
||||||
Expect(err).To(HaveOccurred())
|
framework.ExpectError(err)
|
||||||
verifyPVCsPending(t.Client, createdClaims)
|
verifyPVCsPending(t.Client, createdClaims)
|
||||||
|
|
||||||
By("creating a pod referring to the claims")
|
By("creating a pod referring to the claims")
|
||||||
|
Loading…
Reference in New Issue
Block a user