Skip to content

Disable parallelisation on SslStreamTlsResumeTests - #135751

Merged
rzikm merged 1 commit into
mainfrom
copilot/disable-parallelisation-sslstreamtlsresumetests
Oct 14, 2026
Merged

rzikm merged 1 commit into
mainfrom
copilot/disable-parallelisation-sslstreamtlsresumetests

Conversation

Copilot AI commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

Summary

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 release
  • Targeted TLS resumption tests: 32 passed.
  • Full System.Net.Security test project: 5,116 passed, 8 skipped, 0 failed.

Resolves #133418

Note

This PR description was prepared with GitHub Copilot.

Co-authored-by: rzikm <32671551+rzikm@users.noreply.github.com>
@azure-pipelines

Copy link
Copy Markdown
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.

@rzikm
rzikm requested a review from a team October 14, 2026 08:37
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/ncl, @bartonjs, @vcsjones
See info in area-owners.md if you want to be subscribed.

@tannergooding

Copy link
Copy Markdown
Member

@rzikm
rzikm merged commit 7abf5fa into main Oct 14, 2026
86 of 88 checks passed
@rzikm
rzikm deleted the copilot/disable-parallelisation-sslstreamtlsresumetests branch October 14, 2026 16:03
@rzikm

rzikm commented Oct 14, 2026

Copy link
Copy Markdown
Member

/backport to release/11.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/11.0 (link to workflow run)

@github-actions

Copy link
Copy Markdown
Contributor

@rzikm backporting to release/11.0 failed, the patch most likely resulted in conflicts. Please backport manually!

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

Link to workflow output

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

SslStreamTlsResumeTests.DifferentEncryptionPolicy_NoResume failing

3 participants