One more try in test teardown for avoiding hiding exception...

Author: fredericDelaporte

src/NHibernate.Test/TestCase.cs

@@ -148,31 +148,44 @@ public void TearDown()
 		{
 			var testResult = TestContext.CurrentContext.Result;
 			var fail = false;
+			var testOwnTearDownDone = false;
 			string badCleanupMessage = null;
 			try
 			{
 				try
 				{
 					OnTearDown();
+					testOwnTearDownDone = true;
 				}
 				finally
 				{
-					var wereClosed = _sessionFactory.CheckSessionsWereClosed();
-					var wasCleaned = CheckDatabaseWasCleaned();
-					var wereConnectionsClosed = CheckConnectionsWereClosed();
-					fail = !wereClosed || !wasCleaned || !wereConnectionsClosed;
-
-					if (fail)
+					try
 					{
-						badCleanupMessage = "Test didn't clean up after itself. session closed: " + wereClosed + "; database cleaned: " +
-											wasCleaned
-											+ "; connection closed: " + wereConnectionsClosed;
-						if (testResult != null && testResult.Outcome.Status == TestStatus.Failed)
+						var wereClosed = _sessionFactory.CheckSessionsWereClosed();
+						var wasCleaned = CheckDatabaseWasCleaned();
+						var wereConnectionsClosed = CheckConnectionsWereClosed();
+						fail = !wereClosed || !wasCleaned || !wereConnectionsClosed;
+
+						if (fail)
 						{
-							// Avoid hiding a test failure (asserts are usually not hidden, but other exception would be).
-							badCleanupMessage = GetCombinedFailureMessage(testResult, badCleanupMessage, null);
+							badCleanupMessage = "Test didn't clean up after itself. session closed: " + wereClosed + "; database cleaned: " +
+												wasCleaned
+												+ "; connection closed: " + wereConnectionsClosed;
+							if (testResult != null && testResult.Outcome.Status == TestStatus.Failed)
+							{
+								// Avoid hiding a test failure (asserts are usually not hidden, but other exception would be).
+								badCleanupMessage = GetCombinedFailureMessage(testResult, badCleanupMessage, null);
+							}
 						}
 					}
+					catch (Exception ex)
+					{
+						if (testOwnTearDownDone)
+							throw;
+
+						// Do not hide the test own teardown failure.
+						log.Error("TearDown cleanup failure, while test own teardown has failed. Logging cleanup failure", ex);
+					}
 				}
 			}
 			catch (Exception ex)