aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-27 00:00:49 +0100
committerJustin Clark-Casey (justincc)2012-06-27 00:01:51 +0100
commit5bec5bcf714a94129070cf1b6219984496cbd6c2 (patch)
treed9ee6879830f5676559ac4041a1bbed135f74279 /OpenSim/Region/CoreModules
parentReplace "kill uuid" console command with the more consistent "delete object u... (diff)
downloadopensim-SC_OLD-5bec5bcf714a94129070cf1b6219984496cbd6c2.zip
opensim-SC_OLD-5bec5bcf714a94129070cf1b6219984496cbd6c2.tar.gz
opensim-SC_OLD-5bec5bcf714a94129070cf1b6219984496cbd6c2.tar.bz2
opensim-SC_OLD-5bec5bcf714a94129070cf1b6219984496cbd6c2.tar.xz
Automatically disable log4net before each regression test so that logging is confined to a single test if it's turned on.
This involves making test classes inherit from a common OpenSimTestCase. This will be applied to more classes as required.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs2
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index ddfc6cb..65722fe 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
55 /// Attachment tests 55 /// Attachment tests
56 /// </summary> 56 /// </summary>
57 [TestFixture] 57 [TestFixture]
58 public class AttachmentsModuleTests 58 public class AttachmentsModuleTests : OpenSimTestCase
59 { 59 {
60 [TestFixtureSetUp] 60 [TestFixtureSetUp]
61 public void FixtureInit() 61 public void FixtureInit()
@@ -409,8 +409,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
409 // This is the actual attachment, which should no longer exist 409 // This is the actual attachment, which should no longer exist
410 List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments(); 410 List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments();
411 Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0)); 411 Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0));
412
413// TestHelpers.DisableLogging();
414 } 412 }
415 413
416 // I'm commenting this test because scene setup NEEDS InventoryService to 414 // I'm commenting this test because scene setup NEEDS InventoryService to
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 90ae69d..f9d4b78 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -48,7 +48,7 @@ using OpenSim.Tests.Common.Mock;
48namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests 48namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
49{ 49{
50 [TestFixture] 50 [TestFixture]
51 public class InventoryArchiveTestCase 51 public class InventoryArchiveTestCase : OpenSimTestCase
52 { 52 {
53 protected ManualResetEvent mre = new ManualResetEvent(false); 53 protected ManualResetEvent mre = new ManualResetEvent(false);
54 54