From 28627fcb90b2060bee2618cd011f57e54a824b09 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 6 Feb 2020 12:31:50 -0800 Subject: [PATCH] Update SkipOnCoreClrAttributes to RuntimeConfiguration argument (#31847) * Update SkipOnCoreClrAttributes to RuntimeConfiguration argument * Update XunitExtensions * Fix bad merge --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../Registration/RegistrationBuilderAttributedOverrideUnitTests.cs | 2 +- src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs | 2 +- src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerContextTests.cs | 2 +- .../tests/HttpListenerResponseTests.Cookies.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerResponseTests.cs | 2 +- src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs | 4 ++-- src/libraries/System.Net.Requests/tests/LoggingTest.cs | 2 +- .../System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs | 2 +- .../System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs | 3 +-- .../tests/BigInteger/BigIntegerToStringTests.cs | 2 +- .../tests/BinaryFormatterTests.cs | 2 +- .../System.Text.RegularExpressions/tests/Regex.Match.Tests.cs | 2 +- .../System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs | 2 +- 17 files changed, 19 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68cefee..39de114 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,9 +62,9 @@ https://github.com/dotnet/arcade b65df96ccb820fd5f7ea226aeba310485f395130 - + https://github.com/dotnet/arcade - b65df96ccb820fd5f7ea226aeba310485f395130 + 4207a00bd90a48bdc84f7a7c5ef01c1808772916 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 854eb25..131c3ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 5.0.0-beta.20105.2 5.0.0-beta.20105.2 5.0.0-beta.20105.2 - 5.0.0-beta.20105.2 + 5.0.0-beta.20106.2 2.5.1-beta.20105.2 5.0.0-beta.20105.2 5.0.0-beta.20105.2 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 f6635e0..f47bbd1 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 @@ using Xunit.Sdk; namespace System.ComponentModel.Composition.Registration.Tests { - [SkipOnCoreClr("Test failures on stress tests", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("Test failures on stress tests", RuntimeConfiguration.Checked)] [SkipOnMono("Test failures on stress tests")] public class RegistrationBuilderAttributedOverrideUnitTests { diff --git a/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs b/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs index 08522d3..5a9f8e1 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", RuntimeTestModes.CheckedRuntime)] +[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeConfiguration.Checked)] diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs index f4dbfa8..a5066ee 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", RuntimeTestModes.CheckedRuntime)] +[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeConfiguration.Checked)] [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 b252edf..bf0dcc4 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs @@ -13,7 +13,7 @@ using Xunit; namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] [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 1f6ab1a..f4db00e 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs @@ -14,7 +14,7 @@ using Xunit; namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] [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 d68ac1d..66a12b6 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 @@ using Xunit; namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] [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 92a63be..0e50509 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs @@ -57,7 +57,7 @@ namespace System.Net.Tests } } - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] [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 160c030..f3e2d62 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 @@ namespace System.Net.Mail.Tests [InlineData("howdydoo")] [InlineData("")] [InlineData(null)] - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeConfiguration.Checked)] [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 @@ namespace System.Net.Mail.Tests [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", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeConfiguration.Checked)] [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 995224e..16d7a81 100644 --- a/src/libraries/System.Net.Requests/tests/LoggingTest.cs +++ b/src/libraries/System.Net.Requests/tests/LoggingTest.cs @@ -11,7 +11,7 @@ namespace System.Net.Tests { [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "NetEventSource is only part of .NET Core.")] - [SkipOnCoreClr("System.Net.Tests are flaky", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests are flaky", RuntimeConfiguration.Checked)] 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 910bf85..2a54d98 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 @@ namespace System.Net.Security.Tests } [Fact] - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeConfiguration.Checked)] [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 f4dbfa8..3923493 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,4 @@ using Xunit; -[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")] +[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeConfiguration.Checked)] diff --git a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs index e3601a9..d8e43d8 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 @@ namespace System.Numerics.Tests } [Fact] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeConfiguration.Checked)] 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 05fc021..b527f09 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 @@ namespace System.Runtime.Serialization.Formatters.Tests { // 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", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeConfiguration.Checked)] [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 b470363..ac3db1f 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 @@ namespace System.Text.RegularExpressions.Tests [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", RuntimeTestModes.JitMinOpts)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeConfiguration.Checked, RuntimeTestModes.JitMinOpts)] public void Match_ExcessPrefix(RegexOptions options) { RemoteExecutor.Invoke(optionsString => diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs b/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs index 4d88dc2..6ac41c1 100644 --- a/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs +++ b/src/libraries/System.Threading.Tasks/tests/Task/TaskContinueWithTests.cs @@ -42,7 +42,7 @@ namespace System.Threading.Tasks.Tests // Stresses on multiple continuations from a single antecedent [Fact] - [SkipOnCoreClr("Test timing out: https://github.com/dotnet/runtime/issues/2271", RuntimeTestModes.CheckedRuntime)] + [SkipOnCoreClr("Test timing out: https://github.com/dotnet/runtime/issues/2271", RuntimeConfiguration.Checked)] public static void RunContinueWithStressTestsNoState() { int numIterations = 3; -- 2.7.4