Skip to content

Commit 127ec7b

Browse files
Disable incompatible tests on managed instance (#3678)
* Disable connection resiliency test on SQL Managed Instance * Disable incompatible tests with SQL Managed Instance * Disable MARS session pooling tests * Disable preserve distributed transaction test on managed instance --------- Co-authored-by: Cheena Malhotra <[email protected]>
1 parent 77c35d8 commit 127ec7b

File tree

10 files changed

+44
-37
lines changed

10 files changed

+44
-37
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ public static bool IsEnclaveAzureDatabaseSetup()
399399

400400
public static bool IsNotAzureSynapse() => !IsAzureSynapse;
401401

402+
public static bool IsNotManagedInstance() => !IsManagedInstance;
403+
402404
// Synapse: UDT Test Database not compatible with Azure Synapse.
403405
public static bool IsUdtTestDatabasePresent() => IsDatabasePresent(UdtTestDbName) && IsNotAzureSynapse();
404406

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public static void ConnectionKilledTest()
269269
}
270270

271271
// Synapse: KILL not supported on Azure Synapse - Parse error at line: 1, column: 6: Incorrect syntax near '105'.
272-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
272+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
273273
public static void ConnectionResiliencySPIDTest()
274274
{
275275
SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private async Task BulkCopyDataAsync(CommandBehavior cb, bool enableStraming, in
265265
}
266266
}
267267

268-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
268+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
269269
[MemberData(
270270
nameof(JsonBulkCopyTestData)
271271
#if NETFRAMEWORK
@@ -289,7 +289,7 @@ public void TestJsonBulkCopy(CommandBehavior cb, bool enableStraming, int jsonAr
289289
}
290290
}
291291

292-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
292+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
293293
[MemberData(
294294
nameof(JsonBulkCopyTestData)
295295
#if NETFRAMEWORK

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private void DeleteFile(string filename)
157157
}
158158
}
159159

160-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
160+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
161161
public void TestJsonStreaming()
162162
{
163163
GenerateJsonFile(1000, _jsonFile);
@@ -173,7 +173,7 @@ public void TestJsonStreaming()
173173
}
174174
}
175175

176-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
176+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
177177
public async Task TestJsonStreamingAsync()
178178
{
179179
GenerateJsonFile(1000, _jsonFile);

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void ValidateNullJson(SqlDataReader reader)
7373
}
7474
}
7575

76-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
76+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
7777
public void TestJsonWrite()
7878
{
7979
string tableName = DataTestUtility.GenerateObjectName();
@@ -137,7 +137,7 @@ public void TestJsonWrite()
137137
}
138138
}
139139

140-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
140+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
141141
public async Task TestJsonWriteAsync()
142142
{
143143
string tableName = DataTestUtility.GenerateObjectName();
@@ -201,7 +201,7 @@ public async Task TestJsonWriteAsync()
201201
}
202202
}
203203

204-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
204+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
205205
public void TestJsonRead()
206206
{
207207
string tableName = DataTestUtility.GenerateObjectName();
@@ -260,7 +260,7 @@ public void TestJsonRead()
260260
}
261261
}
262262

263-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
263+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
264264
public async Task TestJsonReadAsync()
265265
{
266266
string tableName = DataTestUtility.GenerateObjectName();
@@ -319,7 +319,7 @@ public async Task TestJsonReadAsync()
319319
}
320320
}
321321

322-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
322+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
323323
public void TestNullJson()
324324
{
325325
string tableName = DataTestUtility.GenerateObjectName();
@@ -350,7 +350,7 @@ public void TestNullJson()
350350
DataTestUtility.DropTable(connection, tableName);
351351
}
352352

353-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
353+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
354354
public void TestJsonAPIs()
355355
{
356356
string tableName = DataTestUtility.GenerateObjectName();
@@ -398,7 +398,7 @@ public void TestJsonAPIs()
398398
}
399399
}
400400

401-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
401+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
402402
public void TestJsonWithMARS()
403403
{
404404
string table1Name = DataTestUtility.GenerateObjectName();
@@ -454,7 +454,7 @@ public void TestJsonWithMARS()
454454
}
455455
}
456456

457-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
457+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
458458
public void TestJsonSPParams()
459459
{
460460
string tableName = DataTestUtility.GenerateObjectName();

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MARSSessionPoolingTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ public static class MARSSessionPoolingTest
3333
}).ConnectionString;
3434

3535
// Synapse: Catalog view 'dm_exec_connections' is not supported in this version.
36-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
36+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
3737
public static void MarsExecuteScalar_AllFlavors()
3838
{
3939
TestMARSSessionPooling("Case: Text, ExecuteScalar", _testConnString, CommandType.Text, ExecuteType.ExecuteScalar, ReaderTestType.ReaderClose, GCType.Wait);
4040
TestMARSSessionPooling("Case: RPC, ExecuteScalar", _testConnString, CommandType.StoredProcedure, ExecuteType.ExecuteScalar, ReaderTestType.ReaderClose, GCType.Wait);
4141
}
4242

4343
// Synapse: Catalog view 'dm_exec_connections' is not supported in this version.
44-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
44+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
4545
public static void MarsExecuteNonQuery_AllFlavors()
4646
{
4747
TestMARSSessionPooling("Case: Text, ExecuteNonQuery", _testConnString, CommandType.Text, ExecuteType.ExecuteNonQuery, ReaderTestType.ReaderClose, GCType.Wait);
4848
TestMARSSessionPooling("Case: RPC, ExecuteNonQuery", _testConnString, CommandType.StoredProcedure, ExecuteType.ExecuteNonQuery, ReaderTestType.ReaderClose, GCType.Wait);
4949
}
5050

5151
// Synapse: Catalog view 'dm_exec_connections' is not supported in this version.
52-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
52+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
5353
public static void MarsExecuteReader_Text_NoGC()
5454
{
5555
TestMARSSessionPooling("Case: Text, ExecuteReader, ReaderClose", _testConnString, CommandType.Text, ExecuteType.ExecuteReader, ReaderTestType.ReaderClose, GCType.Wait);
@@ -58,7 +58,7 @@ public static void MarsExecuteReader_Text_NoGC()
5858
}
5959

6060
// Synapse: Stored procedure sp_who does not exist or is not supported.
61-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
61+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
6262
public static void MarsExecuteReader_RPC_NoGC()
6363
{
6464
TestMARSSessionPooling("Case: RPC, ExecuteReader, ReaderClose", _testConnString, CommandType.StoredProcedure, ExecuteType.ExecuteReader, ReaderTestType.ReaderClose, GCType.Wait);
@@ -68,7 +68,7 @@ public static void MarsExecuteReader_RPC_NoGC()
6868

6969
// Synapse: Catalog view 'dm_exec_connections' is not supported in this version.
7070
[ActiveIssue("11167")]
71-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
71+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
7272
public static void MarsExecuteReader_Text_WithGC()
7373
{
7474
TestMARSSessionPooling("Case: Text, ExecuteReader, GC-Wait", _testConnString, CommandType.Text, ExecuteType.ExecuteReader, ReaderTestType.ReaderGC, GCType.Wait);
@@ -77,7 +77,7 @@ public static void MarsExecuteReader_Text_WithGC()
7777

7878
// Synapse: Stored procedure sp_who does not exist or is not supported.
7979
[ActiveIssue("8959")]
80-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
80+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
8181
public static void MarsExecuteReader_StoredProcedure_WithGC()
8282
{
8383
TestMARSSessionPooling("Case: RPC, ExecuteReader, GC-Wait", _testConnString, CommandType.StoredProcedure, ExecuteType.ExecuteReader, ReaderTestType.ReaderGC, GCType.Wait);

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.Windows.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ public async Task Delegated_transaction_deadlock_in_SinglePhaseCommit()
4545
}
4646
#endif
4747

48-
private static bool s_EnlistedTransactionPreservedWhilePooledCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotX86Architecture;
48+
/** Test fails on SQL Managed Instance with error:
49+
* Failure: Item not found in collection
50+
* Collection: [typeof(System.Transactions.TransactionAbortedException), typeof(System.Transactions.TransactionInDoubtException)]
51+
* Not found: typeof(Microsoft.Data.SqlClient.SqlException)
52+
**/
53+
private static bool s_EnlistedTransactionPreservedWhilePooledCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotX86Architecture && DataTestUtility.IsNotManagedInstance();
4954

5055
[ConditionalFact(nameof(s_EnlistedTransactionPreservedWhilePooledCondition), Timeout = 10000)]
5156
public async Task Test_EnlistedTransactionPreservedWhilePooled()

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private void ValidateInsertedData(SqlConnection connection, float[] expectedData
147147
}
148148
}
149149

150-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
150+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
151151
[MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
152152
public void TestSqlVectorFloat32ParameterInsertionAndReads(
153153
int pattern,
@@ -213,7 +213,7 @@ private async Task ValidateInsertedDataAsync(SqlConnection connection, float[] e
213213
}
214214
}
215215

216-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
216+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
217217
[MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
218218
public async Task TestSqlVectorFloat32ParameterInsertionAndReadsAsync(
219219
int pattern,
@@ -247,7 +247,7 @@ public async Task TestSqlVectorFloat32ParameterInsertionAndReadsAsync(
247247
await ValidateInsertedDataAsync(conn, expectedValues, expectedLength);
248248
}
249249

250-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
250+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
251251
[MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
252252
public void TestStoredProcParamsForVectorFloat32(
253253
int pattern,
@@ -304,7 +304,7 @@ public void TestStoredProcParamsForVectorFloat32(
304304
Assert.Throws<InvalidOperationException>(() => command.ExecuteNonQuery());
305305
}
306306

307-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
307+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
308308
[MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
309309
public async Task TestStoredProcParamsForVectorFloat32Async(
310310
int pattern,
@@ -361,7 +361,7 @@ public async Task TestStoredProcParamsForVectorFloat32Async(
361361
await Assert.ThrowsAsync<InvalidOperationException>(async () => await command.ExecuteNonQueryAsync());
362362
}
363363

364-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
364+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
365365
[InlineData(1)]
366366
[InlineData(2)]
367367
public void TestBulkCopyFromSqlTable(int bulkCopySourceMode)
@@ -460,7 +460,7 @@ public void TestBulkCopyFromSqlTable(int bulkCopySourceMode)
460460
Assert.Equal(VectorFloat32TestData.testData.Length, ((SqlVector<float>)verifyReader.GetSqlVector<float>(0)).Length);
461461
}
462462

463-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
463+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
464464
[InlineData(1)]
465465
[InlineData(2)]
466466
public async Task TestBulkCopyFromSqlTableAsync(int bulkCopySourceMode)
@@ -560,7 +560,7 @@ public async Task TestBulkCopyFromSqlTableAsync(int bulkCopySourceMode)
560560
Assert.Equal(VectorFloat32TestData.testData.Length, vector.Length);
561561
}
562562

563-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
563+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
564564
public void TestInsertVectorsFloat32WithPrepare()
565565
{
566566
SqlConnection conn = new SqlConnection(s_connectionString);

0 commit comments

Comments
 (0)