Skip to content

Commit 952ea88

Browse files
apoorvdeshmukhapoorvdeshmukh
authored
[6.1] Disable incompatible tests for managed instance (#3881)
1 parent 6daa25b commit 952ea88

7 files changed

Lines changed: 32 additions & 28 deletions

File tree

‎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
@@ -264,7 +264,7 @@ private async Task BulkCopyDataAsync(CommandBehavior cb, bool enableStraming, in
264264
}
265265
}
266266

267-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
267+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
268268
[MemberData(
269269
nameof(JsonBulkCopyTestData)
270270
#if NETFRAMEWORK
@@ -288,7 +288,7 @@ public void TestJsonBulkCopy(CommandBehavior cb, bool enableStraming, int jsonAr
288288
}
289289
}
290290

291-
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
291+
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
292292
[MemberData(
293293
nameof(JsonBulkCopyTestData)
294294
#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.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.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
177177
public async Task TestJsonStreamingAsync()
178178
{
179179
GenerateJsonFile(1000, _jsonFile);

‎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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ 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+
private static bool s_EnlistedTransactionPreservedWhilePooledCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotX86Architecture && DataTestUtility.IsNotManagedInstance();
4953

5054
[ConditionalFact(nameof(s_EnlistedTransactionPreservedWhilePooledCondition), Timeout = 10000)]
5155
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);

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private void ValidateInsertedData(SqlConnection connection, float[] expectedData
8181
}
8282
}
8383

84-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
84+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
8585
public void TestVectorDataInsertionAsVarchar()
8686
{
8787
float[] data = { 1.1f, 2.2f, 3.3f };
@@ -173,7 +173,7 @@ private async Task ValidateInsertedDataAsync(SqlConnection connection, float[] e
173173
}
174174
}
175175

176-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
176+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
177177
public async Task TestVectorParameterInitializationAsync()
178178
{
179179
float[] data = { 1.1f, 2.2f, 3.3f };
@@ -245,7 +245,7 @@ public async Task TestVectorParameterInitializationAsync()
245245
await ValidateInsertedDataAsync(conn, null);
246246
}
247247

248-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
248+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
249249
public void TestVectorDataReadsAsVarchar()
250250
{
251251
float[] data = { 1.1f, 2.2f, 3.3f };
@@ -302,7 +302,7 @@ public void TestVectorDataReadsAsVarchar()
302302
Assert.Throws<SqlNullValueException>(() => reader.GetFieldValue<string>(0));
303303
}
304304

305-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
305+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
306306
public async Task TestVectorDataReadsAsVarcharAsync()
307307
{
308308
float[] data = { 1.1f, 2.2f, 3.3f };
@@ -359,7 +359,7 @@ public async Task TestVectorDataReadsAsVarcharAsync()
359359
await Assert.ThrowsAsync<SqlNullValueException>(async () => await reader2.GetFieldValueAsync<string>(0));
360360
}
361361

362-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
362+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
363363
public void TestStoredProcParamsForVectorAsVarchar()
364364
{
365365
// Test data
@@ -405,7 +405,7 @@ public void TestStoredProcParamsForVectorAsVarchar()
405405
Assert.True(outputParam.Value == DBNull.Value);
406406
}
407407

408-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
408+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
409409
public async Task TestStoredProcParamsForVectorAsVarcharAsync()
410410
{
411411
// Test data
@@ -456,7 +456,7 @@ public async Task TestStoredProcParamsForVectorAsVarcharAsync()
456456
Assert.True(outputParam.Value == DBNull.Value);
457457
}
458458

459-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
459+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
460460
public void TestSqlBulkCopyForVectorAsVarchar()
461461
{
462462
//Setup source with test data and create destination table for bulkcopy.
@@ -521,7 +521,7 @@ public void TestSqlBulkCopyForVectorAsVarchar()
521521
Assert.True(verifyReader.IsDBNull(0));
522522
}
523523

524-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
524+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
525525
public async Task TestSqlBulkCopyForVectorAsVarcharAsync()
526526
{
527527
//Setup source with test data and create destination table for bulkcopy.
@@ -586,7 +586,7 @@ public async Task TestSqlBulkCopyForVectorAsVarcharAsync()
586586
Assert.True(await verifyReader.IsDBNullAsync(0));
587587
}
588588

589-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer))]
589+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
590590
public void TestInsertVectorsAsVarcharWithPrepare()
591591
{
592592
SqlConnection conn = new SqlConnection(s_connectionString);

0 commit comments

Comments
 (0)