Fix duplicating paths during remapping #1755
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
BruRdgz
commented
Mar 14, 2024
| files2 = cov2.get_data().measured_files() | ||
|
|
||
| # The order of combining should not affect the resulting files. | ||
| assert set(files1) == set(files2) |
There was a problem hiding this comment.
In hindsight, this is pretty obvious; so that's a stupid check to take away.
| [paths] | ||
| plugins = | ||
| plugins/ | ||
| ci/girder/plugins/ |
There was a problem hiding this comment.
This is weird; I didn't touch this, and these files remain on my local repository. Go figure, I'll check it out later.
nedbat
reviewed
Mar 14, 2024
| @@ -489,6 +489,9 @@ def map(self, path: str, exists:Callable[[str], bool] = source_exists) -> str: | |||
|
|
|||
| # If we get here, no pattern matched. | |||
|
|
|||
| if self.relative: | |||
There was a problem hiding this comment.
A key indication of whether the test is doing what it should: comment out "the fix" and see if the test fails. When I comment out these two lines, all the tests still pass.
nedbat
reviewed
Mar 14, 2024
| @@ -500,18 +500,6 @@ def get_combined_filenames() -> set[str]: | |||
| filenames = {relative_filename(f).replace("\\", "/") for f in data.measured_files()} | |||
| return filenames | |||
|
|
|||
| # Case 1: get the order right. | |||
There was a problem hiding this comment.
I don't understand why you removed this test code.
|
Thanks, I fixed it like this: 1b19799 |
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.
Adds tests for #1752's bugs, along with a patch. Closes the issue.