load quic early to prevent interaction with tests #75488
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
wfurt
added
area-System.Net.Security
os-linux
|
Tagging subscribers to this area: @dotnet/ncl, @vcsjones |
karelz
approved these changes
Sep 12, 2022
jkotas
reviewed
Sep 12, 2022
src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs
Outdated
Show resolved
Hide resolved
danmoseley
approved these changes
Sep 13, 2022
jkotas
reviewed
Sep 13, 2022
src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs
Outdated
Show resolved
Hide resolved
jkotas
reviewed
Sep 13, 2022
src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs
Outdated
Show resolved
Hide resolved
jkotas
reviewed
Sep 13, 2022
| @@ -24,6 +25,8 @@ | |||
| Link="Common\System\Diagnostics\Tracing\TestEventListener.cs" /> | |||
| <Compile Include="$(CommonTestPath)System\IO\TempFile.cs" | |||
| Link="Common\System\IO\TempFile.cs" /> | |||
| <Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs" | |||
There was a problem hiding this comment.
Did we actually see "Error while reaping child" error in the System.Net.Mail tests or is this just a pre-emptive change?
There was a problem hiding this comment.
no we did not. There are two failures I'm investigating so it is pre-emptive.
liveans
approved these changes
Sep 13, 2022
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3050625996 |
|
@karelz backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: load quic early to prevent interaction with tests
Applying: update Debian10 image for x64
Using index info to reconstruct a base tree...
M eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 update Debian10 image for x64
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@CarnaViire @ManickaP can you please help with manual backport here? Thanks! |
CarnaViire
added a commit
to CarnaViire/runtime
that referenced
this pull request
Sep 14, 2022
* load quic early to prevent interaction with tests * update Debian10 image for x64 * rever helix change * feedback from review * remove quic reference * Update src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com>
carlossanlop
pushed a commit
that referenced
this pull request
Sep 14, 2022
* load quic early to prevent interaction with tests * update Debian10 image for x64 * rever helix change * feedback from review * remove quic reference * Update src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com>
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
duplicates #75424 for SslStream tests
fixes #75484