Skip to content

Fix some issues causing aspnetcore-helix-matrix failures #26840

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
Oct 14, 2020
Merged

Fix some issues causing aspnetcore-helix-matrix failures #26840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4418e7
Raise min Windows version for HTTP/2 tests
halter73 Oct 13, 2020
85f3858
Skip ClientDisconnectStress on Windows 7
halter73 Oct 13, 2020
a87992b
Skip TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds on Win 7
halter73 Oct 13, 2020
41fa110
Don't run Windows-only tests on ARM yet
halter73 Oct 13, 2020
30cc292
Skip DataProtectionProviderTests.System_UsesProvidedDirectoryAndCerti…
halter73 Oct 14, 2020
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
4 changes: 2 additions & 2 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
</ItemGroup>
</ItemGroup>
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true'">
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
Expand All @@ -43,7 +43,7 @@
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
</ItemGroup>
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
Copy link
Member

Choose a reason for hiding this comment

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

Is there an issue tracking this part? The initial error looked like an easy fix in TestMatrix.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't believe so, @halter73 could you please confirm? If not, I'll create a new one.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @TanayParikh, but I got it. #26872

<HelixAvailableTargetQueue Include="Windows.10.Arm64.Open" Platform="Windows" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void System_UsesProvidedDirectory_WithConfigurationCallback()

[ConditionalFact]
[X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720 and https://github.com/dotnet/aspnetcore/issues/26871", Queues = "All.OSX;Windows.10.Arm64.Open")]
public void System_UsesProvidedDirectoryAndCertificate()
{
var filePath = Path.Combine(GetTestFilesPath(), "TestCert.pfx");
Expand Down
4 changes: 2 additions & 2 deletions ...Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public async Task Anonymous_Challenge_401Negotiate_Win7()

[ConditionalTheory]
[MemberData(nameof(Http11And2))]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Windows only supports ALPN on 8.1 and later.")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Windows only supports ALPN and required ciphers on 10 and later.")]
public async Task Anonymous_NoChallenge_NoOps(Version version)
{
using var host = await CreateHostAsync();
Expand All @@ -84,7 +84,7 @@ public async Task Anonymous_NoChallenge_NoOps(Version version)

[ConditionalTheory]
[MemberData(nameof(Http11And2))]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Windows only supports ALPN on 8.1 and later.")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Windows only supports ALPN and required ciphers on 10 and later.")]
public async Task Anonymous_Challenge_401Negotiate(Version version)
{
using var host = await CreateHostAsync();
Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ await connection.Send(

[ConditionalFact]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "NullReferenceException https://github.com/dotnet/aspnetcore/issues/26839")]
public async Task ClientDisconnectStress()
{
var maxRequestSize = 1000;
Expand Down
5 changes: 3 additions & 2 deletions src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,8 @@ public async Task Http2_EmitsStartAndStopEventsWithActivityIds()
Assert.Equal(eventIndex, events.Count);
}

[Fact]
[ConditionalFact]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "SslStream.AuthenticateAsServerAsync() doesn't throw on Win 7 when the client tries SSL 2.0.")]
public async Task TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds()
{
int port;
Expand Down Expand Up @@ -298,7 +299,7 @@ public async Task TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds()
{
TargetHost = "localhost",

// Only enabling SslProtocols.Ssl2 should cause a handshake failure on all platforms.
// Only enabling SslProtocols.Ssl2 should cause a handshake failure on most platforms.
#pragma warning disable CS0618 // Type or member is obsolete
EnabledSslProtocols = SslProtocols.Ssl2,
#pragma warning restore CS0618 // Type or member is obsolete
Expand Down