Playing with failing tests on AppVeyor

Author: cincuranet

NETProvider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs

@@ -524,10 +524,10 @@ private DatabaseParameterBuffer BuildDpb(IDatabase db, FbConnectionString option
 			{
 				dpb.Append(IscCodes.isc_dpb_no_db_triggers, 1);
 			}
-            if (options.NoGarbageCollect)
-            {
-                dpb.Append(IscCodes.isc_dpb_no_garbage_collect, (byte)0);
-            }
+			if (options.NoGarbageCollect)
+			{
+				dpb.Append(IscCodes.isc_dpb_no_garbage_collect, (byte)0);
+			}
 
 			return dpb;
 		}

NETProvider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionPoolManager.cs

@@ -105,7 +105,7 @@ public FbConnectionInternal GetConnection(FbConnection owner)
 
 					var connection = _available.Any()
 						? _available.Pop().Connection
-						: CreateNewConnectionIfPossibleImpl(_connectionString, owner);
+						: CreateNewConnectionIfPossibleImpl(_connectionString);
 					connection.SetOwningConnection(owner);
 					_busy.Add(connection);
 					return connection;
@@ -160,10 +160,9 @@ public void ClearPool()
 				}
 			}
 
-			static FbConnectionInternal CreateNewConnection(FbConnectionString connectionString, FbConnection owner)
+			static FbConnectionInternal CreateNewConnection(FbConnectionString connectionString)
 			{
 				var result = new FbConnectionInternal(connectionString);
-				result.SetOwningConnection(owner);
 				result.Connect();
 				return result;
 			}
@@ -196,11 +195,11 @@ void CheckDisposedImpl()
 					throw new ObjectDisposedException(typeof(Pool).Name);
 			}
 
-			FbConnectionInternal CreateNewConnectionIfPossibleImpl(FbConnectionString connectionString, FbConnection owner)
+			FbConnectionInternal CreateNewConnectionIfPossibleImpl(FbConnectionString connectionString)
 			{
 				if (_busy.Count() + 1 > connectionString.MaxPoolSize)
 					throw new InvalidOperationException("Connection pool is full.");
-				return CreateNewConnection(connectionString, owner);
+				return CreateNewConnection(connectionString);
 			}
 		}
 

NETProvider/src/FirebirdSql.Data.UnitTests/FbConnectionTests.cs

@@ -22,6 +22,7 @@
 using System.Configuration;
 using System.Data;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using FirebirdSql.Data.FirebirdClient;
@@ -220,7 +221,6 @@ public void ConnectionPoolingLifeTimeTest()
 
 			Thread.Sleep(TimeSpan.FromSeconds(csb.ConnectionLifeTime * 2));
 			Assert.AreEqual(active, GetActiveConnections());
-
 		}
 
 		[Test]
@@ -234,36 +234,26 @@ public void ConnectionPoolingMaxPoolSizeTest()
 			string cs = csb.ToString();
 
 			var connections = new List<FbConnection>();
-			var thrown = false;
 			try
 			{
 				for (int i = 0; i <= csb.MaxPoolSize; i++)
 				{
 					var connection = new FbConnection(cs);
+					connections.Add(connection);
 					if (i == csb.MaxPoolSize)
 					{
-						try
-						{
-							connection.Open();
-						}
-						catch (InvalidOperationException)
-						{
-							thrown = true;
-						}
+						Assert.Throws<InvalidOperationException>(() => connection.Open());
 					}
 					else
 					{
 						Assert.DoesNotThrow(() => connection.Open());
 					}
-					connections.Add(connection);
 				}
 			}
 			finally
 			{
 				connections.ForEach(x => x.Dispose());
 			}
-
-			Assert.IsTrue(thrown);
 		}
 
 		[Test]
@@ -283,8 +273,8 @@ public void ConnectionPoolingMinPoolSizeTest()
 				for (int i = 0; i < csb.MinPoolSize * 2; i++)
 				{
 					var connection = new FbConnection(cs);
-					Assert.DoesNotThrow(() => connection.Open());
 					connections.Add(connection);
+					Assert.DoesNotThrow(() => connection.Open());
 				}
 			}
 			finally

NETProvider/src/FirebirdSql.Data.UnitTests/TestsBase.cs

@@ -92,7 +92,6 @@ public virtual void SetUp()
 			InsertTestData(cs);
 			this.connection = new FbConnection(cs);
 			this.connection.Open();
-
 			if (this.withTransaction)
 			{
 				this.transaction = this.connection.BeginTransaction();
@@ -128,6 +127,7 @@ public virtual void TearDown()
 				connection.Dispose();
 			}
 			DeleteAllData(cs);
+			FbConnection.ClearAllPools();
 		}
 
 		#endregion

appveyor.yml

@@ -21,7 +21,7 @@ build:
   verbosity: minimal
 test_script:
   - ps: cd $testsDir
-  - ps: nunit-console FirebirdSql.Data.UnitTests.dll /framework:net-4.0 /exclude=Local /nodots /noshadow
+  - ps: nunit-console FirebirdSql.Data.UnitTests.dll /framework:net-4.0 /exclude:Local /nodots /noshadow
 artifacts:
   - path: NETProvider\src\FirebirdSql.Data.FirebirdClient\bin\$(Configuration)\FirebirdSql.Data.FirebirdClient.dll
   - path: NETProvider\src\FirebirdSql.Data.FirebirdClient\bin\$(Configuration)\FirebirdSql.Data.FirebirdClient.pdb