Merge pull request #74314 from oomichi/add-ExpectError

Add ExpectError() to e2e test framework

test/e2e/framework/util.go

@@ -2039,6 +2039,11 @@ func RandomSuffix() string {
 	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.
 func ExpectNoError(err error, explain ...interface{}) {
 	ExpectNoErrorWithOffset(1, err, explain...)

test/e2e/storage/testsuites/provisioning.go

@@ -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
 	By("checking the claims are in pending state")
 	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)
 
 	By("creating a pod referring to the claims")