From 13f69bf1dbb01203eb953de1797db1277c9e18f1 Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 12 Sep 2022 14:45:03 -0700 Subject: [PATCH 1/6] load quic early to prevent interaction with tests --- .../FunctionalTests/System.Net.Security.Tests.csproj | 1 + .../tests/FunctionalTests/TestHelper.cs | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index e00fd263ac15e6..8e808d6eeb877f 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -7,6 +7,7 @@ true true + true diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs index aa2e8e46f23d9f..cded21e985331b 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Net.Sockets; +using System.Net.Quic; using System.Net.Test.Common; using System.Security.Authentication; using System.Security.Cryptography; @@ -260,5 +261,15 @@ static string ProtocolToString(SslProtocols? protocol) return name; } + + [ModuleInitializer] + internal static void InitializeQuic() + { + // This will load Quic (if supported) to avoid interference with RemoteExecutor + // See https://github.com/dotnet/runtime/pull/75424 for more details + // IsSupported currently does not unload lttng. If it does in the future, + // we may need to call some real Quic API here to get everything loaded properly + _ = OperatingSystem.IsLinux() && QuicConnection.IsSupported; + } } } From 9ca0c963c61ec61199f5b8b2b9eb95b45a339213 Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 12 Sep 2022 19:57:33 -0700 Subject: [PATCH 2/6] update Debian10 image for x64 --- eng/pipelines/libraries/helix-queues-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 875fd96f4c75fc..c35eba53a10531 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -68,7 +68,7 @@ jobs: - SLES.15.Amd64.Open - (Fedora.34.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c - (Ubuntu.2204.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64-20220504035722-1b9461f - - (Debian.10.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011 + - (Debian.10.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220912172935-59ee6b3 - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Centos.8.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759 @@ -81,7 +81,7 @@ jobs: - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af - RedHat.7.Amd64.Open - - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011 + - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220912172935-59ee6b3 - Ubuntu.1804.Amd64.Open - ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}: # Limiting interp runs as we don't need as much coverage. From 2882e9ed75b4ef0cee030d6b8ac673470a2588f0 Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 12 Sep 2022 20:06:24 -0700 Subject: [PATCH 3/6] rever helix change --- eng/pipelines/libraries/helix-queues-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index c35eba53a10531..875fd96f4c75fc 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -68,7 +68,7 @@ jobs: - SLES.15.Amd64.Open - (Fedora.34.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c - (Ubuntu.2204.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64-20220504035722-1b9461f - - (Debian.10.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220912172935-59ee6b3 + - (Debian.10.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011 - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Centos.8.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759 @@ -81,7 +81,7 @@ jobs: - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af - RedHat.7.Amd64.Open - - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220912172935-59ee6b3 + - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011 - Ubuntu.1804.Amd64.Open - ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}: # Limiting interp runs as we don't need as much coverage. From 0bf99ea5beb221c059a50c79b3cecd3b37002b2b Mon Sep 17 00:00:00 2001 From: wfurt Date: Mon, 12 Sep 2022 20:22:56 -0700 Subject: [PATCH 4/6] feedback from review --- .../tests => Common/tests/System/Net}/QuicLoad.cs | 0 .../tests/Functional/System.Net.Mail.Functional.Tests.csproj | 3 +++ .../System.Net.Requests/tests/System.Net.Requests.Tests.csproj | 3 ++- .../tests/FunctionalTests/System.Net.Security.Tests.csproj | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) rename src/libraries/{System.Net.Requests/tests => Common/tests/System/Net}/QuicLoad.cs (100%) diff --git a/src/libraries/System.Net.Requests/tests/QuicLoad.cs b/src/libraries/Common/tests/System/Net/QuicLoad.cs similarity index 100% rename from src/libraries/System.Net.Requests/tests/QuicLoad.cs rename to src/libraries/Common/tests/System/Net/QuicLoad.cs 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 2f4f8566c8d380..61a055f504be3e 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 @@ -4,6 +4,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android true true + true @@ -24,6 +25,8 @@ Link="Common\System\Diagnostics\Tracing\TestEventListener.cs" /> + diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index 0e063a6e12a0f9..413a4da999f62c 100644 --- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -15,7 +15,6 @@ - + + Date: Mon, 12 Sep 2022 21:11:48 -0700 Subject: [PATCH 5/6] remove quic reference --- .../System.Net.Security/tests/FunctionalTests/TestHelper.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs index cded21e985331b..b0a85391c300d2 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Net.Sockets; -using System.Net.Quic; using System.Net.Test.Common; using System.Security.Authentication; using System.Security.Cryptography; From edeff467f4596b244f448ca75aea45e9cbe14b25 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Mon, 12 Sep 2022 21:16:01 -0700 Subject: [PATCH 6/6] Update src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs --- .../tests/FunctionalTests/TestHelper.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs index b0a85391c300d2..aa2e8e46f23d9f 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs @@ -260,15 +260,5 @@ static string ProtocolToString(SslProtocols? protocol) return name; } - - [ModuleInitializer] - internal static void InitializeQuic() - { - // This will load Quic (if supported) to avoid interference with RemoteExecutor - // See https://github.com/dotnet/runtime/pull/75424 for more details - // IsSupported currently does not unload lttng. If it does in the future, - // we may need to call some real Quic API here to get everything loaded properly - _ = OperatingSystem.IsLinux() && QuicConnection.IsSupported; - } } }