From a0ec5b661e11719fe445da26943a5bc7a7758f91 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Fri, 31 Jan 2020 17:06:29 -0800 Subject: [PATCH] Update SkipOnCoreClrAttributes to new parameters --- .../RegistrationBuilderAttributedOverrideUnitTests.cs | 2 +- .../tests/FunctionalTests/AssemblyInfo.cs | 2 +- src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs | 2 +- .../System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs | 2 +- .../tests/HttpListenerAuthenticationTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerContextTests.cs | 2 +- .../tests/HttpListenerResponseTests.Cookies.cs | 2 +- .../tests/HttpListenerResponseTests.cs | 2 +- .../System.Net.Mail/tests/Functional/SmtpClientTest.cs | 4 ++-- src/libraries/System.Net.Requests/tests/LoggingTest.cs | 3 +-- .../tests/FunctionalTests/SslStreamSniTest.cs | 2 +- .../System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs | 2 +- .../tests/BigInteger/BigIntegerToStringTests.cs | 2 +- .../tests/BinaryFormatterTests.cs | 2 +- .../System.Text.RegularExpressions/tests/Regex.Match.Tests.cs | 2 +- 15 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs b/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs index 96cd33d298a418..f6635e0ec7710b 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs +++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs @@ -11,7 +11,7 @@ namespace System.ComponentModel.Composition.Registration.Tests { - [SkipOnCoreClr("Test failures on stress tests")] + [SkipOnCoreClr("Test failures on stress tests", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("Test failures on stress tests")] public class RegistrationBuilderAttributedOverrideUnitTests { diff --git a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs index 0d7eda9ff9c4b4..9a17fee4084e15 100644 --- a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,5 @@ using Xunit; -[assembly: SkipOnCoreClr("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux)] +[assembly: SkipOnCoreClr("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)] [assembly: SkipOnMono("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux)] diff --git a/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs b/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs index 7860b6f42f2145..08522d38298f81 100644 --- a/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs +++ b/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs @@ -4,4 +4,4 @@ using Xunit; -[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeStressTestModes.CheckedRuntime)] +[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeTestModes.CheckedRuntime)] diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs index 2fbf85306bc7ca..f4dbfa82accfe0 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,5 @@ using Xunit; -[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] +[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [assembly: SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs index 421caa5bca7840..b252edfe06f0c6 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs @@ -13,7 +13,7 @@ namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerAuthenticationTests : IDisposable diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs index 994d28fd95d8cb..1f6ab1a5dfd09c 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs @@ -14,7 +14,7 @@ namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerContextTests : IDisposable diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs index 8f507e1adf6936..d68ac1dc80c3c6 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs @@ -9,7 +9,7 @@ namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseCookiesTests : HttpListenerResponseTestBase diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs index 905d0c292c36b8..92a63be0c42896 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs @@ -57,7 +57,7 @@ protected async Task GetResponse(string httpVersion = "1.1 } } - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseTests : HttpListenerResponseTestBase diff --git a/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs b/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs index e10bba2eccf43a..160c0308be9241 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs +++ b/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs @@ -339,7 +339,7 @@ public void TestZeroTimeout() [InlineData("howdydoo")] [InlineData("")] [InlineData(null)] - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] public async Task TestMailDeliveryAsync(string body) { @@ -358,7 +358,7 @@ public async Task TestMailDeliveryAsync(string body) [Fact] [PlatformSpecific(TestPlatforms.Windows)] // NTLM support required, see https://github.com/dotnet/corefx/issues/28961 - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] public async Task TestCredentialsCopyInAsyncContext() { diff --git a/src/libraries/System.Net.Requests/tests/LoggingTest.cs b/src/libraries/System.Net.Requests/tests/LoggingTest.cs index d5ae6a58ceab07..995224eb0fdca4 100644 --- a/src/libraries/System.Net.Requests/tests/LoggingTest.cs +++ b/src/libraries/System.Net.Requests/tests/LoggingTest.cs @@ -11,8 +11,7 @@ public class LoggingTest { [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "NetEventSource is only part of .NET Core.")] - [SkipOnCoreClr("System.Net.Tests are flaky")] - [SkipOnMono("System.Net.Tests are flaky")] + [SkipOnCoreClr("System.Net.Tests are flaky", RuntimeTestModes.CheckedRuntime)] public void EventSource_ExistsWithCorrectId() { Type esType = typeof(WebRequest).Assembly.GetType("System.Net.NetEventSource", throwOnError: true, ignoreCase: false); diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs index 3a4f0687a63a08..910bf8575f10d6 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs @@ -137,7 +137,7 @@ public async Task SslStream_ServerCallbackNotSet_UsesLocalCertificateSelection(s } [Fact] - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] public async Task SslStream_NoSniFromClient_CallbackReturnsNull() { diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs index 2fbf85306bc7ca..f4dbfa82accfe0 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,5 @@ using Xunit; -[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] +[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [assembly: SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] diff --git a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs index 3255438e6e2ff0..e3601a9efa6982 100644 --- a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs +++ b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs @@ -188,7 +188,7 @@ public static void RunStandardFormatToStringTests() } [Fact] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeStressTestModes.CheckedRuntime)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)] public static void RunRegionSpecificStandardFormatToStringTests() { CultureInfo[] cultures = new CultureInfo[] { new CultureInfo("en-US"), new CultureInfo("en-GB"), new CultureInfo("fr-CA"), diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs index 52460eca4c7d2e..05fc0218a2c91f 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs @@ -23,7 +23,7 @@ public partial class BinaryFormatterTests : FileCleanupTestBase { // On 32-bit we can't test these high inputs as they cause OutOfMemoryExceptions. [ConditionalTheory(typeof(Environment), nameof(Environment.Is64BitProcess))] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeStressTestModes.CheckedRuntime)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeTestModes.CheckedRuntime)] [InlineData(2 * 6_584_983 - 2)] // previous limit [InlineData(2 * 7_199_369 - 2)] // last pre-computed prime number public void SerializeHugeObjectGraphs(int limit) diff --git a/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs b/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs index f1e3a18c4710f7..09518b18ec2032 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs +++ b/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs @@ -919,7 +919,7 @@ public void Match_SpecialUnicodeCharacters_Invariant() [InlineData(RegexOptions.None)] [InlineData(RegexOptions.Compiled)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have fix for https://github.com/dotnet/corefx/issues/26484")] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeStressTestModes.JitMinOpts)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeTestModes.JitMinOpts)] public void Match_ExcessPrefix(RegexOptions options) { RemoteExecutor.Invoke(optionsString =>