From f0c9cb8dc0eeccf2c686ff8ceacc7e1acceb543d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 17 May 2012 01:34:04 +0100
Subject: Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails()
 regression test logging accidentally left in

---
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | 4 ++--
 OpenSim/Tests/Common/TestHelpers.cs                                 | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index 7c76bed..a351271 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestSameSimulatorSeparatedRegionsQueryAccessFails()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
             Vector3 preTeleportPosition = new Vector3(30, 31, 32);
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // position instead).
 //            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
 
-            TestHelpers.DisableLogging();
+//            TestHelpers.DisableLogging();
         }
 
         [Test]
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index a241a3c..d38d692 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -100,6 +100,12 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Disable logging whilst running the tests.
         /// </summary>
+        /// <remarks>
+        /// Remember, if a regression test throws an exception before completing this will not be invoked if it's at
+        /// the end of the test.
+        /// TODO: Always invoke this after every test - probably need to make all test cases inherit from a common
+        /// TestCase class where this can be done.
+        /// </remarks>
         public static void DisableLogging()
         {
             log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream);
-- 
cgit v1.1