Fix failures on mac

snowflakedb · Feb 20, 2024 · 3d90e7f · 3d90e7f
1 parent 1a7d139
commit 3d90e7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs
@@ -1,8 +1,9 @@
 /*
- * Copyright (c) 2012-2021 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
  */
 
 using System.Data.Common;
+using Snowflake.Data.Tests.Util;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
@@ -1841,7 +1842,7 @@ public void TestAsyncLoginTimeout()
         {
             using (var conn = new MockSnowflakeDbConnection())
             {
-                int timeoutSec = 5;
+                int timeoutSec = 15;
                 string loginTimeOut5sec = String.Format(ConnectionString + "connection_timeout={0};maxHttpRetries=0",
                     timeoutSec);
                 conn.ConnectionString = loginTimeOut5sec;
@@ -1966,8 +1967,7 @@ public void TestAsyncConnectionFailFast()
                 }
                 catch (AggregateException e)
                 {
-                    Assert.AreEqual(SFError.INTERNAL_ERROR.GetAttribute<SFErrorAttr>().errorCode,
-                        ((SnowflakeDbException)e.InnerException).ErrorCode);
+                    SnowflakeDbExceptionAssert.HasErrorCode((SnowflakeDbException)e.InnerException, SFError.INTERNAL_ERROR);
                 }
 
                 Assert.AreEqual(ConnectionState.Closed, conn.State);

diff --git a/Snowflake.Data/Core/SFStatement.cs b/Snowflake.Data/Core/SFStatement.cs
@@ -359,7 +359,7 @@ internal SFBaseResultSet Execute(int timeout, string sql, Dictionary<string, Bin
             }
         }
 
-        internal SFBaseResultSet ExecuteSqlWithPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
+        private SFBaseResultSet ExecuteSqlWithPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
         {
             try
             {
@@ -398,7 +398,7 @@ internal SFBaseResultSet ExecuteSqlWithPutGet(int timeout, string sql, Dictionar
             }
         }
 
-        internal SFBaseResultSet ExecuteSqlOtherThanPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
+        private SFBaseResultSet ExecuteSqlOtherThanPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
         {
             try
             {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            internal SFBaseResultSet ExecuteSqlWithPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
+            private SFBaseResultSet ExecuteSqlWithPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
             {
                 try
                 {
@@ Expand Down Expand Up @@
                 }
             }
-            internal SFBaseResultSet ExecuteSqlOtherThanPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
+            private SFBaseResultSet ExecuteSqlOtherThanPutGet(int timeout, string sql, Dictionary<string, BindingDTO> bindings, bool describeOnly)
             {
                 try
                 {
@@ Expand Down @@