dotnet
diff --git a/‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
Lines changed: 5 additions & 6 deletions b/‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
Lines changed: 5 additions & 6 deletions
@@ -157,7 +157,7 @@ public static void TimeoutCancel()
             TimeoutCancel(tcp_connStr);
         }
 
-        [ActiveIssue("12167")]
+        [ActiveIssue("12167", typeof(DataTestUtility), nameof(DataTestUtility.UseManagedSNIOnWindows))] // Managed SNI does not seem to work here
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public static void TimeoutCancelNP()
@@ -178,15 +178,13 @@ public static void CancelAndDisposePreparedCommandNP()
             CancelAndDisposePreparedCommand(np_connStr);
         }
 
-        [ActiveIssue("5541")]
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]
         public static void TimeOutDuringRead()
         {
             TimeOutDuringRead(tcp_connStr);
         }
 
-        [ActiveIssue("5541")]
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public static void TimeOutDuringReadNP()
         {
@@ -357,7 +355,8 @@ private static void TimeoutCancel(string constr)
                     cmd.CommandText = "WAITFOR DELAY '00:00:20';select * from Customers";
 
                     string errorMessage = SystemDataResourceManager.Instance.SQL_Timeout_Execution;
-                    DataTestUtility.ExpectFailure<SqlException>(() => ExecuteReaderOnCmd(cmd), new string[] { errorMessage });
+                    var ex = Assert.Throws<SqlException>(() => ExecuteReaderOnCmd(cmd));
+                    Assert.Equal(errorMessage, ex.Message);
 
                     VerifyConnection(cmd);
                 }
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public static void TimeoutCancel()`
`157`	`157`	`TimeoutCancel(tcp_connStr);`
`158`	`158`	`}`
`159`	`159`
`160`		`- [ActiveIssue("12167")]`
	`160`	`+ [ActiveIssue("12167", typeof(DataTestUtility), nameof(DataTestUtility.UseManagedSNIOnWindows))] // Managed SNI does not seem to work here`
`161`	`161`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]`
`162`	`162`	`[PlatformSpecific(TestPlatforms.Windows)]`
`163`	`163`	`public static void TimeoutCancelNP()`
`@@ -178,15 +178,13 @@ public static void CancelAndDisposePreparedCommandNP()`
`178`	`178`	`CancelAndDisposePreparedCommand(np_connStr);`
`179`	`179`	`}`
`180`	`180`
`181`		`- [ActiveIssue("5541")]`
`182`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]`
	`181`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]`
`183`	`182`	`public static void TimeOutDuringRead()`
`184`	`183`	`{`
`185`	`184`	`TimeOutDuringRead(tcp_connStr);`
`186`	`185`	`}`
`187`	`186`
`188`		`- [ActiveIssue("5541")]`
`189`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]`
	`187`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]`
`190`	`188`	`[PlatformSpecific(TestPlatforms.Windows)]`
`191`	`189`	`public static void TimeOutDuringReadNP()`
`192`	`190`	`{`
`@@ -357,7 +355,8 @@ private static void TimeoutCancel(string constr)`
`357`	`355`	`cmd.CommandText = "WAITFOR DELAY '00:00:20';select * from Customers";`
`358`	`356`
`359`	`357`	`string errorMessage = SystemDataResourceManager.Instance.SQL_Timeout_Execution;`
`360`		`- DataTestUtility.ExpectFailure<SqlException>(() => ExecuteReaderOnCmd(cmd), new string[] { errorMessage });`
	`358`	`+ var ex = Assert.Throws<SqlException>(() => ExecuteReaderOnCmd(cmd));`
	`359`	`+ Assert.Equal(errorMessage, ex.Message);`
`361`	`360`
`362`	`361`	`VerifyConnection(cmd);`
`363`	`362`	`}`