More BeTrue cleanup #12454
Merged
More BeTrue cleanup #12454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
edsantiago
commented
Nov 30, 2021
edsantiago
commented
- e2e tests: more cleanup of BeTrue()s
- Convert strings.Contains() to Expect(ContainSubstring)
- a few more manual BeTrue cleanups
Write a BeValidJSON() matcher, and replace IsJSONOutputValid(): sed -i -e 's/Expect(\(.*\)\.IsJSONOutputValid()).To(BeTrue())/Expect(\1.OutputToString())\.To(BeValidJSON())/' test/e2e/*_test.go (Plus a few manual tweaks) Signed-off-by: Ed Santiago <[email protected]>
...done manually, not via sed, because some of the inner expressions include nested commas. Signed-off-by: Ed Santiago <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: edsantiago 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 |
openshift-ci
bot
added
the
approved
Signed-off-by: Ed Santiago <[email protected]>
edsantiago
force-pushed
the
remove_betrue
branch
from
a6edec4 to
8eb0be0
Compare
|
LGTM |
Luap99
reviewed
Nov 30, 2021
| @@ -225,7 +225,7 @@ var _ = Describe("Podman commit", func() { | |||
| Expect(inspect).Should(Exit(0)) | |||
| image := inspect.InspectImageJSON() | |||
| _, ok := image[0].Config.Volumes["/foo"] | |||
| Expect(ok).To(BeTrue()) | |||
| Expect(ok).To(BeTrue(), ".Config.Volumes[/foo]") | |||
There was a problem hiding this comment.
FYI This can be changed to Expect(image[0].Config.Volumes).To(HaveKey("/foo))
The same for the other place where you compare a map. There is also a HaveKeyWithValue() function.
|
/lgtm |
vrothberg
reviewed
Dec 1, 2021
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.