From 38d62208e5e27527a55356dca96404677fa9c4ae Mon Sep 17 00:00:00 2001 From: Ahmet Ibrahim Aksoy Date: Fri, 25 Aug 2023 16:33:39 +0300 Subject: [PATCH 1/6] Delete ActiveIssue --- .../System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index 68509bf6b5571f..5aa4b1daa46a0c 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -473,7 +473,6 @@ public async Task Listener_AlpnNarrowingDown_Success() Assert.Equal(new SslApplicationProtocol("test"), clientConnection2.NegotiatedApplicationProtocol); } - [ActiveIssue("https://github.com/dotnet/runtime/issues/86701")] [Theory] [InlineData("foo")] [InlineData("not_existing")] From 6b98b4262d7a2af855966b81cf5e51fa31b8321b Mon Sep 17 00:00:00 2001 From: "Ahmet Ibrahim Aksoy (from Dev Box)" Date: Sat, 26 Aug 2023 17:42:10 +0300 Subject: [PATCH 2/6] Disable Not Existing Inline Data --- .../System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index 5aa4b1daa46a0c..ea269eb379805f 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -475,7 +475,7 @@ public async Task Listener_AlpnNarrowingDown_Success() [Theory] [InlineData("foo")] - [InlineData("not_existing")] + // [InlineData("not_existing")] public async Task Listener_AlpnNarrowingDown_Failure(string alpn) { using CancellationTokenSource testTimeoutCts = new CancellationTokenSource(PassingTestTimeout); From 7514f1446809d3e3d93fa0304a58d84218de0940 Mon Sep 17 00:00:00 2001 From: "Ahmet Ibrahim Aksoy (from Dev Box)" Date: Sat, 26 Aug 2023 22:27:28 +0300 Subject: [PATCH 3/6] Delete connection accept --- .../System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index ea269eb379805f..e3332ee49e5396 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -475,7 +475,7 @@ public async Task Listener_AlpnNarrowingDown_Success() [Theory] [InlineData("foo")] - // [InlineData("not_existing")] + [InlineData("not_existing")] public async Task Listener_AlpnNarrowingDown_Failure(string alpn) { using CancellationTokenSource testTimeoutCts = new CancellationTokenSource(PassingTestTimeout); @@ -510,7 +510,6 @@ public async Task Listener_AlpnNarrowingDown_Failure(string alpn) new SslApplicationProtocol(alpn), }; ValueTask connectTask = CreateQuicConnection(clientOptions); - await Assert.ThrowsAsync(() => listener.AcceptConnectionAsync().AsTask().WaitAsync(timeoutToken)); await Assert.ThrowsAsync(() => connectTask.AsTask().WaitAsync(timeoutToken)); } } From 302a2a0b76d18ee5987d184c7426cb0200174d44 Mon Sep 17 00:00:00 2001 From: "Ahmet Ibrahim Aksoy (from Dev Box)" Date: Sat, 26 Aug 2023 22:30:23 +0300 Subject: [PATCH 4/6] Merge assert and variable --- .../System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index e3332ee49e5396..4488cf092e582f 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -509,8 +509,7 @@ public async Task Listener_AlpnNarrowingDown_Failure(string alpn) { new SslApplicationProtocol(alpn), }; - ValueTask connectTask = CreateQuicConnection(clientOptions); - await Assert.ThrowsAsync(() => connectTask.AsTask().WaitAsync(timeoutToken)); + await Assert.ThrowsAsync(() => CreateQuicConnection(clientOptions).AsTask().WaitAsync(timeoutToken)); } } } From d12cc4d27a1dc35e4d5119a8045dc87b32fe348d Mon Sep 17 00:00:00 2001 From: "Ahmet Ibrahim Aksoy (from Dev Box)" Date: Sun, 27 Aug 2023 12:37:59 +0300 Subject: [PATCH 5/6] Add listener throws case --- .../tests/FunctionalTests/QuicListenerTests.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index 4488cf092e582f..fbe17747952684 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -502,14 +502,19 @@ public async Task Listener_AlpnNarrowingDown_Failure(string alpn) return ValueTask.FromResult(options); } }; + bool isAlpnPresentOnInitialAlpnList = listenerOptions.ApplicationProtocols.Exists(x => x.Protocol.Equals(new SslApplicationProtocol(alpn))); // If the ALPN is not present on initial list, AcceptConnectionAsync will not throw AuthenticationException. await using QuicListener listener = await CreateQuicListener(listenerOptions); - QuicClientConnectionOptions clientOptions = CreateQuicClientOptions(listener.LocalEndPoint); clientOptions.ClientAuthenticationOptions.ApplicationProtocols = new() { new SslApplicationProtocol(alpn), }; - await Assert.ThrowsAsync(() => CreateQuicConnection(clientOptions).AsTask().WaitAsync(timeoutToken)); + ValueTask connectTask = CreateQuicConnection(clientOptions); + if (isAlpnPresentOnInitialAlpnList) + { + await Assert.ThrowsAsync(() => listener.AcceptConnectionAsync().AsTask().WaitAsync(timeoutToken)); + } + await Assert.ThrowsAsync(() => connectTask.AsTask().WaitAsync(timeoutToken)); } } } From 3ebe176ee4526e30b242ac2a5a48bcdd33fdb7f8 Mon Sep 17 00:00:00 2001 From: Ahmet Ibrahim Aksoy Date: Mon, 4 Sep 2023 10:55:59 +0200 Subject: [PATCH 6/6] Update src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marie Píchová <11718369+ManickaP@users.noreply.github.com> --- .../System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index fbe17747952684..94fbf03fe7ea53 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -502,7 +502,7 @@ public async Task Listener_AlpnNarrowingDown_Failure(string alpn) return ValueTask.FromResult(options); } }; - bool isAlpnPresentOnInitialAlpnList = listenerOptions.ApplicationProtocols.Exists(x => x.Protocol.Equals(new SslApplicationProtocol(alpn))); // If the ALPN is not present on initial list, AcceptConnectionAsync will not throw AuthenticationException. + bool isAlpnPresentOnInitialAlpnList = listenerOptions.ApplicationProtocols.Contains(new SslApplicationProtocol(alpn)); // If the ALPN is not present on initial list, AcceptConnectionAsync will not throw AuthenticationException. await using QuicListener listener = await CreateQuicListener(listenerOptions); QuicClientConnectionOptions clientOptions = CreateQuicClientOptions(listener.LocalEndPoint); clientOptions.ClientAuthenticationOptions.ApplicationProtocols = new()