Skip to content

Commit 2307dfb

Browse files
committed
Try again disabling test on arm
1 parent 906178c commit 2307dfb

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,10 @@ public static bool GetSQLServerStatusOnTDS8(string connectionString)
347347

348348
public static bool IsNotX86Architecture => RuntimeInformation.ProcessArchitecture != Architecture.X86;
349349

350+
public static bool IsArm => RuntimeInformation.ProcessArchitecture == Architecture.Arm || RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
351+
352+
public static bool IsNotArm => !IsArm;
353+
350354
public static bool IsDatabasePresent(string name)
351355
{
352356
AvailableDatabases = AvailableDatabases ?? new Dictionary<string, bool>();

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public static void NonFatalTimeoutDuringReadTest(string connectionString)
142142
NonFatalTimeoutDuringRead(connectionString);
143143
}
144144

145-
[ActiveIssue("https://github.com/dotnet/SqlClient/issues/3035", typeof(DataStreamTest), nameof(IsArm))]
145+
[ActiveIssue("https://github.com/dotnet/SqlClient/issues/3035", typeof(DataTestUtility), nameof(DataTestUtility.IsArm))]
146146
[ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
147147
[MemberData(nameof(DataTestUtility.GetConnectionStringsWithEnclaveMemberData), MemberType = typeof(DataTestUtility))]
148148
public static void XmlReaderTest(string connectionString)
@@ -207,12 +207,6 @@ private static void RunAllTestsForSingleServer(string connectionString, bool usi
207207
OutOfOrderGetChars(connectionString);
208208
}
209209

210-
private static bool IsAzureSqlServer(string connectionString) => Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(connectionString).DataSource);
211-
212-
private static bool IsNamedInstance(string connectionString) => new SqlConnectionStringBuilder(connectionString).DataSource.Contains(@"\");
213-
214-
private static bool IsArm => RuntimeInformation.ProcessArchitecture == Architecture.Arm || RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
215-
216210
private static void MultipleResults(string connectionString)
217211
{
218212
using (SqlConnection conn = new SqlConnection(connectionString))

0 commit comments

Comments
 (0)