Enable cancel tests for MySQL but not MariaDB.

MariaDB sends an error payload that causes an exception in the tests; MySQL uses the return value of SLEEP(n) to indicate cancellation.

Author: bgrainger

azure-pipelines.yml

@@ -231,15 +231,15 @@ jobs:
       'MariaDB 10.4':
         image: 'mariadb:10.4'
         connectionStringExtra: ''
-        unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
+        unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
       'MariaDB 10.5':
         image: 'mariadb:10.5'
         connectionStringExtra: ''
-        unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
+        unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
       'MariaDB 10.6':
         image: 'mariadb:10.6'
         connectionStringExtra: ''
-        unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
+        unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
   steps:
   - template: '.ci/integration-tests-steps.yml'
     parameters:

tests/SideBySide/CancelTests.cs

@@ -21,7 +21,7 @@ public void NoCancel()
 		Assert.InRange(stopwatch.ElapsedMilliseconds, 100, 1000);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully)]
 	public void CancelCommand()
 	{
 		using var cmd = new MySqlCommand("SELECT SLEEP(5)", m_database.Connection);
@@ -380,7 +380,7 @@ public async Task CancelMultiStatementInRead()
 	}
 
 #if !BASELINE
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully)]
 	public void CancelBatchCommand()
 	{
 		using var batch = new MySqlBatch(m_database.Connection)

tests/SideBySide/CommandTimeoutTests.cs

@@ -46,7 +46,7 @@ public void LargeCommandTimeoutIsCoerced()
 		Assert.Equal(2_147_483, command.CommandTimeout);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully)]
 	public void CommandTimeoutWithSleepSync()
 	{
 		var connectionState = m_connection.State;
@@ -72,7 +72,7 @@ public void CommandTimeoutWithSleepSync()
 		Assert.Equal(connectionState, m_connection.State);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully | ServerFeatures.Timeout)]
 	public async Task CommandTimeoutWithSleepAsync()
 	{
 		var connectionState = m_connection.State;
@@ -98,7 +98,7 @@ public async Task CommandTimeoutWithSleepAsync()
 		Assert.Equal(connectionState, m_connection.State);
 	}
 
-	[SkippableTheory(ServerFeatures.Timeout)]
+	[SkippableTheory(ServerFeatures.CancelSleepSuccessfully)]
 	[InlineData(true)]
 	[InlineData(false)]
 	public void CommandTimeoutWithStoredProcedureSleepSync(bool pooling)
@@ -136,7 +136,7 @@ create procedure sleep_sproc(IN seconds INT)
 		TestUtilities.AssertDuration(sw, cmd.CommandTimeout * 1000 - 100, 500);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully)]
 	public void MultipleCommandTimeoutWithSleepSync()
 	{
 		var connectionState = m_connection.State;
@@ -170,7 +170,7 @@ public void MultipleCommandTimeoutWithSleepSync()
 		Assert.Equal(connectionState, m_connection.State);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully | ServerFeatures.Timeout)]
 	public async Task MultipleCommandTimeoutWithSleepAsync()
 	{
 		var connectionState = m_connection.State;
@@ -203,7 +203,7 @@ public async Task MultipleCommandTimeoutWithSleepAsync()
 		Assert.Equal(connectionState, m_connection.State);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout, Baseline = "https://bugs.mysql.com/bug.php?id=88124")]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully, Baseline = "https://bugs.mysql.com/bug.php?id=88124")]
 	public void CommandTimeoutResetsOnReadSync()
 	{
 		var csb = new MySqlConnectionStringBuilder(m_connection.ConnectionString);
@@ -224,7 +224,7 @@ public void CommandTimeoutResetsOnReadSync()
 		Assert.Equal(ConnectionState.Open, m_connection.State);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout, Baseline = "https://bugs.mysql.com/bug.php?id=88124")]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully | ServerFeatures.Timeout, Baseline = "https://bugs.mysql.com/bug.php?id=88124")]
 	public async Task CommandTimeoutResetsOnReadAsync()
 	{
 		var csb = new MySqlConnectionStringBuilder(m_connection.ConnectionString);
@@ -246,7 +246,7 @@ public async Task CommandTimeoutResetsOnReadAsync()
 	}
 
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully)]
 	public void TransactionCommandTimeoutWithSleepSync()
 	{
 		var connectionState = m_connection.State;
@@ -273,7 +273,7 @@ public void TransactionCommandTimeoutWithSleepSync()
 		Assert.Equal(connectionState, m_connection.State);
 	}
 
-	[SkippableFact(ServerFeatures.Timeout)]
+	[SkippableFact(ServerFeatures.CancelSleepSuccessfully)]
 	public async Task TransactionCommandTimeoutWithSleepAsync()
 	{
 		var connectionState = m_connection.State;

tests/SideBySide/ServerFeatures.cs

@@ -30,4 +30,9 @@ public enum ServerFeatures
 	/// The MySQL server can start streaming rows back as soon as they are available, as opposed to buffering the entire result set in memory.
 	/// </summary>
 	StreamingResults = 0x20_0000,
+
+	/// <summary>
+	/// A "SLEEP" command produces a result set when it is cancelled, not an error payload.
+	/// </summary>
+	CancelSleepSuccessfully = 0x40_0000,
 }