Skip to content
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

[RISC-V] Fix System.Net.Sockets.Tests on Qemu #104094

Merged
merged 10 commits into from
Jul 24, 2024
Merged

[RISC-V] Fix System.Net.Sockets.Tests on Qemu #104094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd886c7
[RISC-V] Fix System.Net.Sockets.Tests on Qemu
yurai007 Jun 27, 2024
a54d6ce
[RISC-V] Address code review comments
yurai007 Jul 3, 2024
4cf9509
[RISC-V] Address code review comments cont
yurai007 Jul 3, 2024
22981df
[RISC-V] Address code review comments cont cont
yurai007 Jul 5, 2024
a82fee7
[RISC-V] Address last code review comments
yurai007 Jul 9, 2024
ab84e6d
[RISC-V] Address last code review comments cont
yurai007 Jul 9, 2024
49dd253
[RISC-V] Remove redundant import
yurai007 Jul 9, 2024
4fe6b04
[RISC-V] Address last code review comments
yurai007 Jul 10, 2024
421f18f
[RISC-V] Restore IsNotQemuLinux, remove isQemu
yurai007 Jul 12, 2024
d65036f
Apply suggestions from code review
jkotas Jul 12, 2024
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
3 changes: 3 additions & 0 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -30,6 +31,8 @@ public static partial class PlatformDetection

public static bool IsMonoLinuxArm64 => IsMonoRuntime && IsLinux && IsArm64Process;
public static bool IsNotMonoLinuxArm64 => !IsMonoLinuxArm64;
public static bool IsQemuLinux => IsLinux && Environment.GetEnvironmentVariable("DOTNET_RUNNING_UNDER_QEMU") != null;
public static bool IsNotQemuLinux => !IsQemuLinux;
jkotas marked this conversation as resolved.
Show resolved Hide resolved

// OSX family
public static bool IsApplePlatform => IsOSX || IsiOS || IstvOS || IsMacCatalyst;
Expand Down
16 changes: 13 additions & 3 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

using Microsoft.DotNet.XUnitExtensions;
using Xunit;

namespace System.Net.Sockets.Tests
Expand Down Expand Up @@ -792,14 +792,19 @@ await Task.WhenAll(
}
}

[Theory]
[ConditionalTheory]
[PlatformSpecific(TestPlatforms.AnyUnix)] // API throws PNSE on Unix
[InlineData(0)]
[InlineData(1)]
public void Connect_ConnectTwice_NotSupported(int invalidatingAction)
{
using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
{
if (PlatformDetection.IsQemuLinux && invalidatingAction == 1)
{
throw new SkipTestException("Skip on Qemu due to [ActiveIssue(https://github.com/dotnet/runtime/issues/104542)]");
}
yurai007 marked this conversation as resolved.
Show resolved Hide resolved

switch (invalidatingAction)
{
case 0:
Expand All @@ -823,7 +828,7 @@ public void Connect_ConnectTwice_NotSupported(int invalidatingAction)
}
}

[Theory]
[ConditionalTheory]
[PlatformSpecific(TestPlatforms.AnyUnix)] // API throws PNSE on Unix
[InlineData(0)]
[InlineData(1)]
Expand All @@ -833,6 +838,11 @@ public void ConnectAsync_ConnectTwice_NotSupported(int invalidatingAction)

using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
{
if (PlatformDetection.IsQemuLinux && invalidatingAction == 1)
{
throw new SkipTestException("Skip on Qemu due to [ActiveIssue(https://github.com/dotnet/runtime/issues/104542)]");
}
yurai007 marked this conversation as resolved.
Show resolved Hide resolved

switch (invalidatingAction)
{
case 0:
Expand Down
9 changes: 8 additions & 1 deletion src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.InteropServices;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;

namespace System.Net.Sockets.Tests
Expand Down Expand Up @@ -122,6 +123,7 @@ public void Socket_KeepAlive_Interval_And_Time()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/104545", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))]
public void Socket_Get_KeepAlive_Time_AsByteArray_OptionLengthZero_Failure()
{
using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
Expand All @@ -138,12 +140,17 @@ public void Socket_Get_KeepAlive_Time_AsByteArray_OptionLengthZero_Failure()
}
}

[Theory]
[ConditionalTheory]
[InlineData(null)]
[InlineData(new byte[0])]
[InlineData(new byte[3] { 0, 0, 0 })]
public void Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(byte[] buffer)
{
if (PlatformDetection.IsQemuLinux && (buffer == null || buffer.Length == 0))
{
throw new SkipTestException("Skip on Qemu due to [ActiveIssue(https://github.com/dotnet/runtime/issues/104545)]");
}
yurai007 marked this conversation as resolved.
Show resolved Hide resolved

using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
{
if (PlatformDetection.IsWindows)
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public void ReuseUnicastPort_CreateSocketSetOption()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))]
public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetSucceeds_GetThrows()
{
int interfaceIndex = 0;
Expand All @@ -65,6 +66,7 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286
[ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))]
public async Task MulticastInterface_Set_AnyInterface_Succeeds()
{
// On all platforms, index 0 means "any interface"
Expand Down Expand Up @@ -123,6 +125,7 @@ public void MulticastInterface_Set_InvalidIndex_Throws()
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286
[SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD, "Expected behavior is different on OSX or FreeBSD")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/52124", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))]
public async Task MulticastInterface_Set_IPv6_AnyInterface_Succeeds()
{
// On all platforms, index 0 means "any interface"
Expand Down
Loading