Skip to content

load quic early to prevent interaction with tests #75488

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 7 commits into from
Sep 14, 2022
Merged

load quic early to prevent interaction with tests #75488

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13f69bf
load quic early to prevent interaction with tests
wfurt Sep 12, 2022
9ca0c96
update Debian10 image for x64
wfurt Sep 13, 2022
2882e9e
rever helix change
wfurt Sep 13, 2022
6eab600
Merge branch 'main' of https://github.com/dotnet/runtime into quicLoa…
wfurt Sep 13, 2022
0bf99ea
feedback from review
wfurt Sep 13, 2022
12259b2
remove quic reference
wfurt Sep 13, 2022
edeff46
Update src/libraries/System.Net.Security/tests/FunctionalTests/TestHe…
jkotas Sep 13, 2022
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
0 ...ies/System.Net.Requests/tests/QuicLoad.cs → ...aries/Common/tests/System/Net/QuicLoad.cs
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>
<ItemGroup>
<Compile Include="AlternateViewCollectionTest.cs" />
Expand All @@ -24,6 +25,8 @@
Link="Common\System\Diagnostics\Tracing\TestEventListener.cs" />
<Compile Include="$(CommonTestPath)System\IO\TempFile.cs"
Link="Common\System\IO\TempFile.cs" />
<Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs"
Copy link
Member

@jkotas jkotas Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we actually see "Error while reaping child" error in the System.Net.Mail tests or is this just a pre-emptive change?

Copy link
Member Author

@wfurt wfurt Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no we did not. There are two failures I'm investigating so it is pre-emptive.

Link="Common\System\Net\System\Net\QuicLoad.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<Compile Include="AssemblyInfo.cs" />
<Compile Include="HttpWebRequestTest.cs" />
<Compile Include="HttpWebResponseTest.cs" />
<Compile Include="QuicLoad.cs" />
<Compile Include="RequestStreamTest.cs" />
<Compile Include="WebRequestTest.cs" />
<Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs"
Expand All @@ -28,6 +27,8 @@
Link="Common\System\Net\Configuration.Http.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs"
Link="Common\System\Net\Configuration.Security.cs" />
<Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs"
Link="Common\System\Net\System\Net\QuicLoad.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs"
Link="Common\System\Net\Http\LoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.AuthenticationHelpers.cs"
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<!-- the res/xml/network_security_config.xml file comes from the System.Net.TestData package -->
<IncludeNetworkSecurityConfig Condition="'$(TargetOS)' == 'Android'">true</IncludeNetworkSecurityConfig>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
Expand Down Expand Up @@ -73,6 +74,8 @@
Link="Common\System\Net\HttpsTestClient.cs" />
<Compile Include="$(CommonTestPath)System\Net\HttpsTestServer.cs"
Link="Common\System\Net\HttpsTestServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs"
Link="Common\System\Net\System\Net\QuicLoad.cs" />
<Compile Include="$(CommonTestPath)System\Net\SslProtocolSupport.cs"
Link="Common\System\Net\SslProtocolSupport.cs" />
<Compile Include="$(CommonTestPath)System\Net\TestLogging.cs"
Expand Down
10 changes: 10 additions & 0 deletions src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,5 +260,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;
}
}
}