aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-17 01:34:04 +0100
committerJustin Clark-Casey (justincc)2012-05-17 01:34:04 +0100
commitf0c9cb8dc0eeccf2c686ff8ceacc7e1acceb543d (patch)
treec694322f627a7d17c97065cee3816dceb4c4dbf7 /OpenSim
parentminor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator bec... (diff)
downloadopensim-SC_OLD-f0c9cb8dc0eeccf2c686ff8ceacc7e1acceb543d.zip
opensim-SC_OLD-f0c9cb8dc0eeccf2c686ff8ceacc7e1acceb543d.tar.gz
opensim-SC_OLD-f0c9cb8dc0eeccf2c686ff8ceacc7e1acceb543d.tar.bz2
opensim-SC_OLD-f0c9cb8dc0eeccf2c686ff8ceacc7e1acceb543d.tar.xz
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs4
-rw-r--r--OpenSim/Tests/Common/TestHelpers.cs6
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
169 public void TestSameSimulatorSeparatedRegionsQueryAccessFails() 169 public void TestSameSimulatorSeparatedRegionsQueryAccessFails()
170 { 170 {
171 TestHelpers.InMethod(); 171 TestHelpers.InMethod();
172 TestHelpers.EnableLogging(); 172// TestHelpers.EnableLogging();
173 173
174 UUID userId = TestHelpers.ParseTail(0x1); 174 UUID userId = TestHelpers.ParseTail(0x1);
175 Vector3 preTeleportPosition = new Vector3(30, 31, 32); 175 Vector3 preTeleportPosition = new Vector3(30, 31, 32);
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
234 // position instead). 234 // position instead).
235// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt)); 235// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
236 236
237 TestHelpers.DisableLogging(); 237// TestHelpers.DisableLogging();
238 } 238 }
239 239
240 [Test] 240 [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
100 /// <summary> 100 /// <summary>
101 /// Disable logging whilst running the tests. 101 /// Disable logging whilst running the tests.
102 /// </summary> 102 /// </summary>
103 /// <remarks>
104 /// Remember, if a regression test throws an exception before completing this will not be invoked if it's at
105 /// the end of the test.
106 /// TODO: Always invoke this after every test - probably need to make all test cases inherit from a common
107 /// TestCase class where this can be done.
108 /// </remarks>
103 public static void DisableLogging() 109 public static void DisableLogging()
104 { 110 {
105 log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream); 111 log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream);