review1

Author: sfc-gh-pcyrek

Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsAsyncIT.cs

@@ -1,10 +1,10 @@
+using System;
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
 using Snowflake.Data.Client;
-using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Mock;
@@ -125,10 +125,10 @@ public async Task TestMinPoolSizeAsync()
 
             // act
             await connection.OpenAsync().ConfigureAwait(false);
-            Thread.Sleep(1000);
 
             // assert
             var pool = SnowflakeDbConnectionPool.GetPool(connection.ConnectionString);
+            Awaiter.WaitUntilConditionOrTimeout(() => pool.GetCurrentPoolSize() == 3, TimeSpan.FromMilliseconds(1000));
             Assert.AreEqual(3, pool.GetCurrentPoolSize());
 
             // cleanup

Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsIT.cs

@@ -343,11 +343,10 @@ public void TestMinPoolSize()
 
             // act
             connection.Open();
-            Thread.Sleep(1000);
-
 
             // assert
             var pool = SnowflakeDbConnectionPool.GetPool(connection.ConnectionString);
+            Awaiter.WaitUntilConditionOrTimeout(() => pool.GetCurrentPoolSize() == 3, TimeSpan.FromMilliseconds(1000));
             Assert.AreEqual(3, pool.GetCurrentPoolSize());
 
             // cleanup
@@ -442,7 +441,7 @@ public void TestReturningCancelledSessionsToThePool([Values]bool cancelAsync)
                 }
             }, CancellationToken.None);
 
-            Thread.Sleep(1000);
+            Awaiter.WaitUntilConditionOrTimeout(() => pool.GetCurrentState().IdleSessionsCount == 0, TimeSpan.FromMilliseconds(1000));
 
             // one busy session
             Assert.AreEqual(0, pool.GetCurrentState().IdleSessionsCount);

Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs

@@ -130,8 +130,8 @@ public void TestConcurrentConnectionPoolingAsync()
             string connStr = ConnectionString + ";application=TestConcurrentConnectionPoolingAsync";
             SnowflakeDbConnectionPool.SetMaxPoolSize(3);
             SnowflakeDbConnectionPool.SetTimeout(1); // set short pooling timeout to cover the case that connection expired
-            ConcurrentPoolingAsyncHelper(connStr, true, 3, 3, 3);
-            SnowflakeDbConnectionPool.SetTimeout(20);
+            ConcurrentPoolingAsyncHelper(connStr, true, 5, 5, 3);
+            SnowflakeDbConnectionPool.SetTimeout(3600);
         }
 
         [Test(Description = "test connection pooling with concurrent connection and using async calls no close call for connection. Connection is closed when Dispose() is called by framework.")]
@@ -141,8 +141,8 @@ public void TestConcurrentConnectionPoolingDisposeAsync()
             string connStr = ConnectionString + ";application=TestConcurrentConnectionPoolingDisposeAsync";
             SnowflakeDbConnectionPool.SetMaxPoolSize(3);
             SnowflakeDbConnectionPool.SetTimeout(1); // set short pooling timeout to cover the case that connection expired
-            ConcurrentPoolingAsyncHelper(connStr, false, 3, 3, 3);
-            SnowflakeDbConnectionPool.SetTimeout(20);
+            ConcurrentPoolingAsyncHelper(connStr, false, 5, 5, 3);
+            SnowflakeDbConnectionPool.SetTimeout(3600);
         }
 
         public static void ConcurrentPoolingAsyncHelper(string connectionString, bool closeConnection, int tasksCount, int connectionsInTask, int abandonedConnectionsCount)

Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheIT.cs

@@ -56,7 +56,8 @@ public void TestBasicConnectionPool()
         public void TestConcurrentConnectionPooling()
         {
             // add test case name in connection string to make in unique for each test case
-            string connStr = ConnectionString + ";application=TestConcurrentConnectionPooling;maxPoolSize=2;";
+            string connStr = ConnectionString + ";application=TestConcurrentConnectionPooling;";
+            SnowflakeDbConnectionPool.SetMaxPoolSize(2);
             ConcurrentPoolingHelper(connStr, true);
         }
 
@@ -67,7 +68,8 @@ public void TestConcurrentConnectionPooling()
         public void TestConcurrentConnectionPoolingDispose()
         {
             // add test case name in connection string to make in unique for each test case
-            string connStr = ConnectionString + ";application=TestConcurrentConnectionPoolingNoClose;maxPoolSize=2";
+            string connStr = ConnectionString + ";application=TestConcurrentConnectionPoolingNoClose;";
+            SnowflakeDbConnectionPool.SetMaxPoolSize(2);
             ConcurrentPoolingHelper(connStr, false);
         }
 
@@ -81,7 +83,7 @@ static void ConcurrentPoolingHelper(string connectionString, bool closeConnectio
 
             // reset to default settings in case it changed by other test cases
             Assert.AreEqual(true, SnowflakeDbConnectionPool.GetPool(connectionString).GetPooling()); // to instantiate pool
-            SnowflakeDbConnectionPool.SetMaxPoolSize(10);
+            SnowflakeDbConnectionPool.SetMaxPoolSize(2);
             SnowflakeDbConnectionPool.SetTimeout(PoolTimeout);
 
             var threads = new Task[ThreadNum];
@@ -360,7 +362,8 @@ public void TestCloseSessionAfterTimeout()
 
             // act
             conn2.Open(); // it gets a session from the caching pool firstly closing session of conn1 in background
-            Thread.Sleep(TimeForBackgroundSessionCloseMillis); // wait for closing expired session
+
+            Awaiter.WaitUntilConditionOrTimeout(() => !session.IsEstablished(), TimeSpan.FromMilliseconds(TimeForBackgroundSessionCloseMillis));
 
             // assert
             Assert.IsFalse(session.IsEstablished());