NH-2176 - Forgotten update of ambient transaction. More cleanup of DTC tests.

Author: fredericDelaporte

src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs

@@ -141,7 +141,7 @@ public void WillNotCrashOnDtcPrepareFailure()
 		}
 
 		[Test]
-		public void Can_roll_back_transaction()
+		public void CanRollbackTransaction()
 		{
 			var tx = new TransactionScope();
 			var disposeCalled = false;
@@ -218,7 +218,6 @@ public void TransactionInsertWithRollBackTask()
 						s.Save(person);
 						ForceEscalationToDistributedTx.Escalate(true); //will rollback tx
 						person.CreatedAt = DateTime.Now;
-						s.Update(person);
 					}
 					txscope.Complete();
 				}
@@ -259,7 +258,6 @@ public void TransactionInsertLoadWithRollBackTask()
 					{
 						var person = s.Get<Person>(savedId);
 						person.CreatedAt = createdAt.AddMonths(-1);
-						s.Update(person);
 					}
 					ForceEscalationToDistributedTx.Escalate(true);
 
@@ -308,7 +306,6 @@ public void TransactionInsertLoadFlushWithRollBackTask()
 					{
 						var person = s.Get<Person>(savedId);
 						person.CreatedAt = createdAt.AddMonths(-1);
-						s.Update(person);
 						s.Flush();
 					}
 					ForceEscalationToDistributedTx.Escalate(true);
@@ -343,7 +340,7 @@ public void MultiThreadedTransaction()
 			{
 				delegate
 					{
-						Can_roll_back_transaction();
+						CanRollbackTransaction();
 						_totalCall++;
 					},
 				delegate
@@ -375,9 +372,10 @@ public void MultiThreadedTransaction()
 		public void CanDeleteItemInDtc()
 		{
 			object id;
+			ISession s;
 			using (var tx = new TransactionScope())
 			{
-				using (var s = sessions.OpenSession())
+				using (s = sessions.OpenSession())
 				{
 					id = s.Save(new Person { CreatedAt = DateTime.Today });
 
@@ -387,15 +385,17 @@ public void CanDeleteItemInDtc()
 				}
 			}
 
-			using (var s = sessions.OpenSession())
+			s.GetSessionImplementation().TransactionContext?.WaitOne();
+
+			using (s = sessions.OpenSession())
 			using (s.BeginTransaction())
 			{
 				Assert.AreEqual(1, s.Query<Person>().Count(), "Entity not found in database.");
 			}
 
 			using (var tx = new TransactionScope())
 			{
-				using (var s = sessions.OpenSession())
+				using (s = sessions.OpenSession())
 				{
 					ForceEscalationToDistributedTx.Escalate();
 
@@ -405,6 +405,8 @@ public void CanDeleteItemInDtc()
 				}
 			}
 
+			s.GetSessionImplementation().TransactionContext?.WaitOne();
+
 			AssertNoPersons();
 		}
 

src/NHibernate/AdoNet/ConnectionManager.cs

@@ -155,6 +155,7 @@ private void CloseConnection()
 		{
 			Factory.ConnectionProvider.CloseConnection(_connection);
 			_connection = null;
+			_connectionAmbientTransaction = null;
 		}
 
 		public DbConnection GetConnection()
@@ -378,6 +379,7 @@ public void EnlistIfRequired()
 			// Probable case: nested transaction scope. Supporting this could be done by releasing the
 			// connection instead of enlisting.
 			_session.Connection.EnlistTransaction(tran);
+			_connectionAmbientTransaction = tran;
 		}
 
 		private bool RequireConnectionSwapInDtc