Use EXPECT instead of EXPECTF when possible #3133
Closed
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
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
|
Merged EXPECTF->EXPECT changes via ded3d98 to avoid bit-rot. I did not merge the second commit, as there's a typo in the variable name which prevents it from ever triggering. I didn't fix this as I'd like to have a CI run on that change, to make sure we don't add any warnings. Two good follow-up changes would be:
|
nikic
reviewed
Feb 20, 2018
| @@ -2123,7 +2123,11 @@ function run_test($php, $file, $env) | |||
| @unlink($test_file); | |||
| } | |||
|
|
|||
| if (!$leaked && !$failed_headers) { | |||
| // check if EXPECT isn't better | |||
| if (isset($section_test['EXPECTF']) && preg_match('/%a|%e|%i|%u|%b|%c|%d|%e|%f|%r|%s|%w|%x/i', $wanted) === 0) { | |||
There was a problem hiding this comment.
Typo here: $section_test instead of $section_text.
There was a problem hiding this comment.
@nikic Should I fix it and rePR?
@nikic Sure should be easy to do it!
You mean https://stackoverflow.com/a/1552782/4595097? Is so, I'll figure out how to do it 馃槃 |
Closed
This was referenced Apr 21, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
While refactoring some tests, I've noticed that some of them used
EXPECTFwithout any regular expression or symbol to change. In those cases,EXPECTwould be preferred, as its logic inrun-tests.phpis a lot simpler thanEXPECTF.After some logic, I could verify that it was common across all tests, so I've created a verification in
run-tests.phpto warning us when this happens, so we can improve it 馃槃