Skip to content

Fix SslStreamDisposeTest for parallel handshake on Unix #114100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 4, 2025
Merged

Fix SslStreamDisposeTest for parallel handshake on Unix #114100

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
197ffdc
[Test Failure] SslStreamDisposeTest.Dispose_ParallelWithHandshake_Thr…
rzikm Apr 1, 2025
8708842
fixup! [Test Failure] SslStreamDisposeTest.Dispose_ParallelWithHandsh…
rzikm Apr 1, 2025
4dbe1fe
fixup! fixup! [Test Failure] SslStreamDisposeTest.Dispose_ParallelWit…
rzikm Apr 1, 2025
5e89d0c
Update src/libraries/System.Net.Security/tests/FunctionalTests/SslStr…
rzikm Apr 1, 2025
05fe6f3
Fix build
rzikm Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamDisposeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public async Task Dispose_PendingReadAsync_ThrowsODE(bool bufferedRead)
using CancellationTokenSource cts = new CancellationTokenSource();
cts.CancelAfter(TestConfiguration.PassingTestTimeout);


(SslStream client, SslStream server) = TestHelper.GetConnectedSslStreams(leaveInnerStreamOpen: true);
using (client)
using (server)
Expand Down Expand Up @@ -113,8 +114,7 @@ public async Task Dispose_ParallelWithHandshake_ThrowsODE()

await Parallel.ForEachAsync(System.Linq.Enumerable.Range(0, 10000), cts.Token, async (i, token) =>
{
// use real Tcp streams to avoid specific behavior of ConnectedStreams when concurrently disposed
(Stream clientStream, Stream serverStream) = TestHelper.GetConnectedTcpStreams();
(Stream clientStream, Stream serverStream) = TestHelper.GetConnectedStreams();

using SslStream client = new SslStream(clientStream);
using SslStream server = new SslStream(serverStream);
Expand Down Expand Up @@ -149,6 +149,11 @@ static async Task ValidateExceptionAsync(Task task)
{
await task;
}
catch (InvalidOperationException ex) when (ex.StackTrace?.Contains("System.IO.StreamBuffer.WriteAsync") ?? true)
{
// Writing to a disposed ConnectedStream (test only, does not happen with NetworkStream)
return;
}
catch (Exception ex) when (ex
is ObjectDisposedException // disposed locally
or IOException // disposed remotely (received unexpected EOF)
Expand Down
Loading