Repository navigation
Disable parallelisation on SslStreamTlsResumeTests - #135751
Merged
rzikm merged 1 commit intoOct 14, 2026
Merged
Conversation
Co-authored-by: rzikm <32671551+rzikm@users.noreply.github.com>
|
Azure Pipelines: Successfully started running 4 pipeline(s). 12 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Copilot stopped work on behalf of
rzikm due to an error
October 14, 2026 08:33
rzikm
marked this pull request as ready for review
October 14, 2026 08:36
rzikm
approved these changes
Oct 14, 2026
Contributor
|
Tagging subscribers to this area: @dotnet/ncl, @bartonjs, @vcsjones |
This was referenced Oct 14, 2026
Closed
Member
|
This should theoretically also fix:
|
tannergooding
approved these changes
Oct 14, 2026
rzikm
deleted the
copilot/disable-parallelisation-sslstreamtlsresumetests
branch
October 14, 2026 16:03
Member
|
/backport to release/11.0 |
Contributor
|
Started backporting to |
Contributor
|
@rzikm backporting to git am output$ git cherry-pick 7abf5fa1d3c3a21969b84cf407a82f99c05e2a3c
Auto-merging src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowTlsResumeTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowTlsResumeTests.cs
Auto-merging src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
error: could not apply 7abf5fa1d3c... Disable parallelisation on SslStreamTlsResumeTests (#135751)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Serialize TLS resumption tests
Using index info to reconstruct a base tree...
M src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowTlsResumeTests.cs
M src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowTlsResumeTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowTlsResumeTests.cs
Auto-merging src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Serialize TLS resumption tests
Error: The process '/usr/bin/git' failed with exit code 128 |
This was referenced Oct 20, 2026
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
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.
Summary
SslStreamTlsResumeTests.DisableParallelizationcollection definition in the test assembly.The class relies on session-cache state across connections. Running it outside parallel test collections prevents other tests in the assembly from interfering with that state.
Validation
./build.sh clr+libs -rc releaseResolves #133418
Note
This PR description was prepared with GitHub Copilot.