Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ExpectError() to e2e test framework #74314

Merged
merged 1 commit into from May 9, 2019

Conversation

@oomichi
Copy link
Member

commented Feb 20, 2019

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

There is a lot of gomega.Expect(err).To(gomega.HaveOccurred()) callers which expect an error happens in e2e tests.
However these test code seems confusing because the code readers need to take care of To() or NotTo() on each test scenario.
This adds ExpectError() for more readable test code.
In addition, this applies ExpectError() to e2e provisioning.go as a sample.

Does this PR introduce a user-facing change?:

NONE
Add ExpectError() to e2e test framework
There is a lot of gomega.Expect(err).To(gomega.HaveOccurred()) callers
which expect an error happens in e2e tests.
However these test code seems confusing because the code readers
need to take care of To() or NotTo() on each test scenario.
This adds ExpectError() for more readable test code.
In addition, this applies ExpectError() to e2e provisioning.go as a
sample.
@jsafrane

This comment has been minimized.

Copy link
Member

commented May 9, 2019

/approve

@timothysc
Copy link
Member

left a comment

/lgtm
/approve

@@ -2038,6 +2038,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{}) {

This comment has been minimized.

Copy link
@timothysc

timothysc May 9, 2019

Member

I'm genuinely surprised this has not existed for a while.

This comment has been minimized.

Copy link
@oomichi

oomichi May 9, 2019

Author Member

Hehe, yeah right. Other guys also said the same thing.
Thanks for your approval anyways :-)

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented May 9, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, oomichi, timothysc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit b27fe7f into kubernetes:master May 9, 2019

20 checks passed

cla/linuxfoundation oomichi authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-csi-serial Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gce-storage-slow Job succeeded.
Details
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.