From 060b801ee2c28cf2fc174dffbd9dc2d58a7e5739 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 28 Jul 2026 19:41:27 -0700 Subject: [PATCH 1/3] Remove stabilized DateTime variant flaky markers Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 64a6d241-8263-4451-b207-65459e29a980 --- .../tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs index 3d84e0ff2c..fba7d2c11e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs @@ -52,7 +52,6 @@ public TestResult(object value, string baseTypeName) /// Tests for DateTime variant parameters with different date/time types. /// [Trait("Set", "3")] - [Trait("Category", "flaky")] public class DateTimeVariantTests { private static void RunTest( @@ -329,6 +328,7 @@ public void TestSqlDataReaderParameterToTVP_Type( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReaderParameterToTVP_Variant( From 053ab0e89567779b653bb1594c292c72b46d3732 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 28 Jul 2026 19:44:37 -0700 Subject: [PATCH 2/3] Remove additional stabilized test markers Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 64a6d241-8263-4451-b207-65459e29a980 --- .../tests/FunctionalTests/LocalizationTest.cs | 1 - .../tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs | 1 - .../tests/ManualTests/SQL/ParameterTest/ParametersTest.cs | 3 --- 3 files changed, 5 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs index 250c009b27..d78d801fde 100644 --- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs @@ -40,7 +40,6 @@ public class LocalizationTest [InlineData("ru-RU")] [InlineData("zh-Hans")] [InlineData("zh-Hant")] - [Trait("Category", "flaky")] public void Localization_Tests(string culture) { string localized = GetLocalizedErrorMessage(culture); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs index a3330a371b..03675e83fd 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs @@ -201,7 +201,6 @@ public static void GetXmlReader_ReturnsXmlReaderCorrectly(string connectionStrin // Enumeration is disabled to prevent generating empty test set when connection strings are not setup. [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)] - [Trait("Category", "flaky")] public static void ReadStream_ReadsStreamDataCorrectly(string connectionString) { ReadStream(connectionString); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs index d2cafd3c76..89f0522df0 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs @@ -244,7 +244,6 @@ public static void Test_WithGuidValue_ShouldReturnGuid() } // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'TYPE'. - [Trait("Category", "flaky")] [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void TestParametersWithDatatablesTVPInsert() { @@ -287,7 +286,6 @@ public static void TestParametersWithDatatablesTVPInsert() #if !NETFRAMEWORK // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'TYPE'. - [Trait("Category", "flaky")] [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void TestParametersWithSqlRecordsTVPInsert() { @@ -379,7 +377,6 @@ public static void TestDateOnlyTVPDataTable_CommandSP() cmd.ExecuteNonQuery(); } - [Trait("Category", "flaky")] [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void TestDateOnlyTVPSqlDataRecord_CommandSP() { From 8f15789420cc5ca16de31642911873ed4aa099eb Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 28 Jul 2026 20:22:57 -0700 Subject: [PATCH 3/3] Preserve environment-sensitive flaky markers Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e3e5c96e-86fb-4c23-a009-ebfcc9898f04 --- .../tests/FunctionalTests/LocalizationTest.cs | 1 + .../SQL/ParameterTest/DateTimeVariantTests.cs | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs index d78d801fde..250c009b27 100644 --- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs @@ -40,6 +40,7 @@ public class LocalizationTest [InlineData("ru-RU")] [InlineData("zh-Hans")] [InlineData("zh-Hant")] + [Trait("Category", "flaky")] public void Localization_Tests(string culture) { string localized = GetLocalizedErrorMessage(culture); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs index fba7d2c11e..6c3231a3a8 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs @@ -124,6 +124,7 @@ private static void xsql(SqlConnection conn, string sql) cmd.ExecuteNonQuery(); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleParameter_Type( @@ -160,6 +161,7 @@ public void TestSimpleParameter_Type( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleParameter_Variant( @@ -196,6 +198,7 @@ public void TestSimpleParameter_Variant( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataRecordParameterToTVP_Type( @@ -239,6 +242,7 @@ public void TestSqlDataRecordParameterToTVP_Type( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataRecordParameterToTVP_Variant( @@ -282,6 +286,7 @@ public void TestSqlDataRecordParameterToTVP_Variant( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReaderParameterToTVP_Type( @@ -377,6 +382,7 @@ public void TestSqlDataReaderParameterToTVP_Variant( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReader_TVP_Type( @@ -452,6 +458,7 @@ public void TestSqlDataReader_TVP_Type( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReader_TVP_Variant( @@ -527,6 +534,7 @@ public void TestSqlDataReader_TVP_Variant( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleDataReader_Type( @@ -584,6 +592,7 @@ public void TestSimpleDataReader_Type( expectedBaseTypeOverrides); } + [Trait("Category", "flaky")] [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleDataReader_Variant(