Commonize \r\n / \n handling in test cases. #1519
Merged
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
Extracted from microsoft#1514 Rather than each test case inventing their own way of dealing with the Windows/Linux `r`n vs `n difference, this change just always makes the output collection functions to do that transformation.
BillyONeal
changed the title
rn / `n handling in test cases.rn / ``n handling in test cases.
BillyONeal
changed the title
rn / ``n handling in test cases.
ras0219-msft
approved these changes
Oct 22, 2024
| @@ -51,20 +51,25 @@ if ($output -notmatch 'Trailing comma') { | |||
| # Check for msgAlreadyInstalled vs. msgAlreadyInstalledNotHead | |||
| $output = Run-VcpkgAndCaptureOutput @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports" install vcpkg-internal-e2e-test-port3 | |||
| Throw-IfFailed | |||
| if ($output -notmatch 'vcpkg-internal-e2e-test-port3:[^ ]+ is already installed') { | |||
| if (-not $output -contains @" | |||
There was a problem hiding this comment.
This looks like it is testing for completely different output; what am I missing here?
There was a problem hiding this comment.
Huh, I'm surprised it passes now. There is duplicate output here. In #1514 from which this change was extracted, I removed the duplicate output, and had to fix this test to look for the not removed of the two.
There was a problem hiding this comment.
I changed this one to do Throw-IfNotContains and I reverted the other one.
BillyONeal
commented
Oct 22, 2024
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.
Extracted from #1514
Rather than each test case inventing their own way of dealing with the Windows/Linux `r`n vs `n difference, this change just always makes the output collection functions to do that transformation.