run-tests.php: class for test file loading #6678
Closed
Conversation
This file contains hidden or 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
nikic
reviewed
Feb 15, 2021
| $tested = $test->getName(); | ||
|
|
||
| if ($num_repeats > 1 && $test->hasSection('FILE_EXTERNAL')) { | ||
| return skip_test($tested, $tested_file, $shortname, 'Test with FILE_EXTERNAL might not be repeatable'); |
There was a problem hiding this comment.
Did you verify that this still works (--repeat 2 on ext/phar should do it I think)? IIRC the FILE_EXTERNAL section gets dropped during processing and can't be checked here anymore.
There was a problem hiding this comment.
Fixed by removing the unset(), it's not needed for anything.
nikic
reviewed
Feb 15, 2021
| if ($this->hasSection('REDIRECTTEST')) { | ||
| if ($inRedirect) { | ||
| throw new BorkageException("Can't redirect a test from within a redirected test"); | ||
| } |
run-tests.php
Outdated
|
|
||
| public function getSection(string $name): string | ||
| { | ||
| return $this->sections[$name] ?? throw new Exception("Section $name not found"); |
This moves a bunch of code outside of run_tests(), making it a bit more manageable. Additionally, accessors provide better readability than isset() and friends. This is a minimal patch that moves the code but does not refactor much. For the sake of reviewing experience, it does not involve further refactoring which could include: * Removing setSection() * Fixing up the mess with hasSection() vs. sectionNotEmpty(), only one of which is really needed. * Moving more repetitive code into the new class. All of this will be done with later commits.
nikic
approved these changes
Mar 16, 2021
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.
This moves a bunch of code outside of run_tests(), making it a bit
more manageable. Additionally, accessors provide better readability
than isset() and friends.
This is a minimal patch that moves the code but does not refactor
much. For the sake of reviewing experience, it does not involve
further refactoring which could include:
one of which is really needed.
All of this will be done with later commits.
Verification:
./run-tests.php ext/phar --repeat 2produces no failures.