From fab3288504275b681fc94d3c5dc1c6daa32ce159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 2 Sep 2022 20:20:33 +0200 Subject: [PATCH] [mono] Enable a bunch of System.Net tests on Windows They were disabled but it looks like the underlying problem was fixed since they pass now. Closes https://github.com/dotnet/runtime/issues/34690 --- .../tests/FunctionalTests/AssemblyInfo.cs | 6 ------ .../System.Net.Http.WinHttpHandler.Functional.Tests.csproj | 1 - .../System.Net.Mail/tests/Functional/AssemblyInfo.cs | 6 ------ .../Functional/System.Net.Mail.Functional.Tests.csproj | 1 - .../tests/FunctionalTests/IPGlobalPropertiesTest.cs | 1 - .../tests/FunctionalTests/NetworkInterfaceBasicTest.cs | 1 - src/libraries/System.Net.Requests/tests/AssemblyInfo.cs | 1 - .../tests/FunctionalTests/AssemblyInfo.cs | 1 - .../tests/FunctionalTests/AssemblyInfo.cs | 1 - src/libraries/System.Net.WebClient/tests/AssemblyInfo.cs | 1 - .../tests/ClientWebSocketOptionsTests.cs | 1 - .../System.Net.WebSockets.Client/tests/CloseTest.cs | 1 - .../System.Net.WebSockets.Client/tests/ConnectTest.cs | 6 ------ .../System.Net.WebSockets.Client/tests/DeflateTests.cs | 1 - .../System.Net.WebSockets/tests/WebSocketCreateTest.cs | 4 ---- 15 files changed, 33 deletions(-) delete mode 100644 src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/AssemblyInfo.cs delete mode 100644 src/libraries/System.Net.Mail/tests/Functional/AssemblyInfo.cs diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/AssemblyInfo.cs deleted file mode 100644 index 54c8a4d926e5c3..00000000000000 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Xunit; - -[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index 8ee59f267d328a..d9605be0059c45 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -10,7 +10,6 @@ Link="Common\System\Net\Configuration.cs" /> - diff --git a/src/libraries/System.Net.Mail/tests/Functional/AssemblyInfo.cs b/src/libraries/System.Net.Mail/tests/Functional/AssemblyInfo.cs deleted file mode 100644 index 54c8a4d926e5c3..00000000000000 --- a/src/libraries/System.Net.Mail/tests/Functional/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Xunit; - -[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj index d7014a3e0a65b5..2f4f8566c8d380 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj @@ -8,7 +8,6 @@ - diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs index b1be503ee4cabf..87775923829108 100644 --- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs +++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/IPGlobalPropertiesTest.cs @@ -160,7 +160,6 @@ public void IPGlobalProperties_UdpListeners_Succeed(IPAddress address) } [Theory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [PlatformSpecific(~(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.Android))] [MemberData(nameof(Loopbacks))] public async Task IPGlobalProperties_TcpActiveConnections_Succeed(IPAddress address) diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs index 4b4a4ad44d9b23..14b5d9ffaf1d1f 100644 --- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs +++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs @@ -274,7 +274,6 @@ public void BasicTest_GetIsNetworkAvailable_Success() } [ConditionalTheory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD, "Expected behavior is different on OSX or FreeBSD")] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] [InlineData(false)] diff --git a/src/libraries/System.Net.Requests/tests/AssemblyInfo.cs b/src/libraries/System.Net.Requests/tests/AssemblyInfo.cs index 3e5956a3d6fb35..f1270b57a36645 100644 --- a/src/libraries/System.Net.Requests/tests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Requests/tests/AssemblyInfo.cs @@ -4,6 +4,5 @@ using System; using Xunit; -[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/74667", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoLinuxArm64))] [assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Net.Requests is not supported on Browser.")] diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/AssemblyInfo.cs index 9adf9f8c835361..b80edd16806be5 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,4 @@ using System; using Xunit; -[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Net.Security is not supported on Browser")] diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs index 96ed05fbfb7aa4..09a34bb9c412c3 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,4 @@ using Xunit; [assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", ~RuntimeConfiguration.Release)] -[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on Browser")] diff --git a/src/libraries/System.Net.WebClient/tests/AssemblyInfo.cs b/src/libraries/System.Net.WebClient/tests/AssemblyInfo.cs index d7fe854700dc17..3b64820724cc76 100644 --- a/src/libraries/System.Net.WebClient/tests/AssemblyInfo.cs +++ b/src/libraries/System.Net.WebClient/tests/AssemblyInfo.cs @@ -3,5 +3,4 @@ using Xunit; -[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Net.WebClient is not recommended for new development and not supported on Browser")] diff --git a/src/libraries/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs b/src/libraries/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs index 665d8208b41421..257436bbb77fae 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs +++ b/src/libraries/System.Net.WebSockets.Client/tests/ClientWebSocketOptionsTests.cs @@ -236,7 +236,6 @@ await LoopbackServer.CreateClientAndServerAsync(async uri => } [ConditionalTheory(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [InlineData("ws")] [InlineData("wss")] [SkipOnPlatform(TestPlatforms.Browser, "Credentials not supported on browser")] diff --git a/src/libraries/System.Net.WebSockets.Client/tests/CloseTest.cs b/src/libraries/System.Net.WebSockets.Client/tests/CloseTest.cs index c09df107c8538c..5fa05c51dea471 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/CloseTest.cs +++ b/src/libraries/System.Net.WebSockets.Client/tests/CloseTest.cs @@ -390,7 +390,6 @@ public async Task CloseAsync_DuringConcurrentReceiveAsync_ExpectedStates(Uri ser } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [ActiveIssue("https://github.com/dotnet/runtime/issues/54153", TestPlatforms.Browser)] public async Task CloseAsync_CancelableEvenWhenPendingReceive_Throws() { diff --git a/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs b/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs index fd0eee1265cfa1..4cde76efbf9e99 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs +++ b/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs @@ -110,7 +110,6 @@ public async Task ConnectAsync_AddCustomHeaders_Success(Uri server) } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.Browser, "SetRequestHeader not supported on browser")] public async Task ConnectAsync_AddHostHeader_Success() { @@ -231,7 +230,6 @@ public async Task ConnectAsync_PassMultipleSubProtocols_ServerRequires_Connectio } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.Browser, "SetRequestHeader not supported on Browser")] public async Task ConnectAsync_NonStandardRequestHeaders_HeadersAddedWithoutValidation() { @@ -295,7 +293,6 @@ public async Task ConnectAsync_CancellationRequestedInflightConnect_ThrowsOperat } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] public async Task ConnectAsync_CancellationRequestedAfterConnect_ThrowsOperationCanceledException() { var releaseServer = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -330,7 +327,6 @@ await server.AcceptConnectionAsync(async connection => } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.Browser, "CollectHttpResponseDetails not supported on Browser")] public async Task ConnectAsync_HttpResponseDetailsCollectedOnFailure() { @@ -350,7 +346,6 @@ await LoopbackServer.CreateClientAndServerAsync(async uri => } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.Browser, "CollectHttpResponseDetails not supported on Browser")] public async Task ConnectAsync_HttpResponseDetailsCollectedOnFailure_CustomHeader() { @@ -373,7 +368,6 @@ await LoopbackServer.CreateClientAndServerAsync(async uri => } [ConditionalFact(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.Browser, "CollectHttpResponseDetails not supported on Browser")] public async Task ConnectAsync_HttpResponseDetailsCollectedOnSuccess_Extensions() { diff --git a/src/libraries/System.Net.WebSockets.Client/tests/DeflateTests.cs b/src/libraries/System.Net.WebSockets.Client/tests/DeflateTests.cs index 262e45ae414db8..dbad6872c23a9f 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/DeflateTests.cs +++ b/src/libraries/System.Net.WebSockets.Client/tests/DeflateTests.cs @@ -36,7 +36,6 @@ public DeflateTests(ITestOutputHelper output) : base(output) } [ConditionalTheory(nameof(WebSocketsSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [InlineData(15, true, 15, true, "permessage-deflate; client_max_window_bits")] [InlineData(14, true, 15, true, "permessage-deflate; client_max_window_bits=14")] [InlineData(15, true, 14, true, "permessage-deflate; client_max_window_bits; server_max_window_bits=14")] diff --git a/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs b/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs index ac0035eb415911..f8323a20332027 100644 --- a/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs +++ b/src/libraries/System.Net.WebSockets/tests/WebSocketCreateTest.cs @@ -41,7 +41,6 @@ public void CreateFromStream_ValidBufferSizes_CreatesWebSocket() [Theory] [MemberData(nameof(EchoServers))] [SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on this platform.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] public async Task WebSocketProtocol_CreateFromConnectedStream_CanSendReceiveData(Uri echoUri) { if (PlatformDetection.IsWindows7) @@ -104,7 +103,6 @@ public async Task ReceiveAsync_UTF8SplitAcrossMultipleBuffers_ValidDataReceived( [Theory] [SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on this platform.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [InlineData(0b_1000_0001, 0b_0_000_0001, false)] // fin + text, no mask + length == 1 [InlineData(0b_1100_0001, 0b_0_000_0001, true)] // fin + rsv1 + text, no mask + length == 1 [InlineData(0b_1010_0001, 0b_0_000_0001, true)] // fin + rsv2 + text, no mask + length == 1 @@ -182,7 +180,6 @@ public async Task ReceiveAsync_InvalidPayloadLength_AbortsAndThrowsException(byt [Fact] [SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on this platform.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] public async Task ReceiveAsync_ServerSplitHeader_ValidDataReceived() { using (Socket listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) @@ -237,7 +234,6 @@ public async Task ReceiveAsync_ServerSplitHeader_ValidDataReceived() [Theory] [MemberData(nameof(EchoServersAndBoolean))] [SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on this platform.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] public async Task WebSocketProtocol_CreateFromConnectedStream_CloseAsyncClosesStream(Uri echoUri, bool explicitCloseAsync) { if (PlatformDetection.IsWindows7)