Make the check strict to use ExpectNoError() #78740
Conversation
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
area/test
sig/testing
oomichi
force-pushed
the
extend-check
branch
2 times, most recently
from
d57206d
to
cf1f7d3
Compare
test/e2e/common/expansion.go
Outdated
| @@ -29,7 +29,6 @@ import ( | |||
| imageutils "k8s.io/kubernetes/test/utils/image" | |||
|
|
|||
| . "github.com/onsi/ginkgo" | |||
There was a problem hiding this comment.
We could also remove the . dot imports here ?
There was a problem hiding this comment.
Yeah, we could with another PR for keeping this PR scope simple and clean.
|
/test pull-kubernetes-bazel-build |
k8s-ci-robot
added
the
needs-rebase
As kubernetes#78478 we can use ExpectNoError() instead of Expect(err).ToNot(HaveOccurred()) also. This makes the test code check strict to cover the above case and replaces the remaining in test/e2e/common/expansion.go
k8s-ci-robot
removed
the
needs-rebase
|
/retest |
1 similar comment
|
/retest |
|
/assign @k-toyoda-pi |
| @@ -25,7 +25,7 @@ mapfile -t all_e2e_files < <(find test/e2e -name '*.go' | grep -v 'test/e2e/fram | |||
| errors_expect_no_error=() | |||
| for file in "${all_e2e_files[@]}" | |||
| do | |||
| if grep "Expect(.*)\.NotTo(.*HaveOccurred()" "${file}" > /dev/null | |||
| if grep -E "Expect\(.*\)\.(NotTo|ToNot)\(.*HaveOccurred\(\)" "${file}" > /dev/null | |||
There was a problem hiding this comment.
verify-test-code.sh adds to detect Expect(err).ToNot(HaveOccurred()).
But, it says about only NotTo as the below.
The above files need to use framework.ExpectNoError(err) instead of
Expect(err).NotTo(HaveOccurred()) or gomega.Expect(err).NotTo(gomega.HaveOccurred())
Why don't you add ToNot to error comment? Is it redundant?
There was a problem hiding this comment.
That is a nice point.
As we see, ToNot is not major and I feel it could be enough to contain NotTo only for easy explanation.
There was a problem hiding this comment.
OK, I understood that.
/lgtm
k8s-ci-robot
added
the
lgtm
|
/cc @BenTheElder Could you take a look at this? |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BenTheElder, oomichi 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 |
k8s-ci-robot
added
the
approved
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
As #78478 we can use
ExpectNoError() instead of Expect(err).ToNot(HaveOccurred()) also.
This makes the test code check strict to cover the above case and
replaces the remaining in test/e2e/common/expansion.go
Which issue(s) this PR fixes:
Ref: #77103
Does this PR introduce a user-facing change?: