Improvements around test_pidfile_contents #1328
Draft
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
The test previously admitted some good values as bad. The implementation also allowed some nonsense values to come out of the parser.
|
This still fails, at least because |
exarkun
commented
Aug 11, 2023
| @@ -264,17 +265,49 @@ def test_non_numeric_pid(self): | |||
| self.assertThat(runs, Equals([])) | |||
| self.assertThat(result_code, Equals(1)) | |||
|
|
|||
| good_file_content_re = re.compile(r"\w[0-9]*\w[0-9]*\w") | |||
There was a problem hiding this comment.
I greatly elaborated this regular expression and removed some subtle inconsistencies with the real parser but note that apart from getting much longer a significant change here is going from \w ("word character") to \s ("whitespace character") - a pretty dramatic inconsistency, I think.
exarkun
commented
Aug 11, 2023
| @@ -49,6 +53,8 @@ def parse_pidfile(pidfile): | |||
| pidfile | |||
| ) | |||
| ) | |||
| if pid <= 0 or starttime < 0: | |||
| raise InvalidPidFile(f"Found value out of bounds: pid={pid} time={starttime}") | |||
There was a problem hiding this comment.
even though these values pass through our simple parser above, we know that they are semantically nonsensical so we can exclude them here rather than letting them reach other parts of the system.
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.
https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3983
https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3984
https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4058