From 6bdea15ecf6fdaaf705704dddf9199b882675963 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Mar 2012 01:11:37 +0000
Subject: minor: make NPC tests run in a given order, comment out log lines in
 mock region data plugins, null out scene in script and npc torture tests, add
 other doc comments to torture tests

---
 OpenSim/Tests/Torture/NPCTortureTests.cs    |  7 ++++---
 OpenSim/Tests/Torture/ObjectTortureTests.cs | 15 +++++++++------
 OpenSim/Tests/Torture/ScriptTortureTests.cs |  1 +
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Tests/Torture')

diff --git a/OpenSim/Tests/Torture/NPCTortureTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs
index 65732db..0224505 100644
--- a/OpenSim/Tests/Torture/NPCTortureTests.cs
+++ b/OpenSim/Tests/Torture/NPCTortureTests.cs
@@ -76,6 +76,7 @@ namespace OpenSim.Tests.Torture
         public void TearDown()
         {
             scene.Close();
+            scene = null;
             GC.Collect();
             GC.WaitForPendingFinalizers();
 
@@ -102,7 +103,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void TestAddRemove100NPCs()
+        public void Test_0001_AddRemove100NPCs()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -111,7 +112,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void TestAddRemove1000NPCs()
+        public void Test_0002_AddRemove1000NPCs()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -120,7 +121,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void TestAddRemove2000NPCs()
+        public void Test_0003_AddRemove2000NPCs()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs
index 7e9946b..978a308 100644
--- a/OpenSim/Tests/Torture/ObjectTortureTests.cs
+++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Tests.Torture
 //        }
 
         [Test]
-        public void Test0001_10K_1PrimObjects()
+        public void Test_0001_10K_1PrimObjects()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -75,7 +75,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void Test0002_100K_1PrimObjects()
+        public void Test_0002_100K_1PrimObjects()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void Test0003_200K_1PrimObjects()
+        public void Test_0003_200K_1PrimObjects()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -93,7 +93,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void Test0011_100_100PrimObjects()
+        public void Test_0011_100_100PrimObjects()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -102,7 +102,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void Test0012_1K_100PrimObjects()
+        public void Test_0012_1K_100PrimObjects()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -111,7 +111,7 @@ namespace OpenSim.Tests.Torture
         }
 
         [Test]
-        public void Test0013_2K_100PrimObjects()
+        public void Test_0013_2K_100PrimObjects()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -123,6 +123,9 @@ namespace OpenSim.Tests.Torture
         {
             UUID ownerId = new UUID("F0000000-0000-0000-0000-000000000000");
 
+            // Using a local variable for scene, at least on mono 2.6.7, means that it's much more likely to be garbage
+            // collected when we teardown this test.  If it's done in a member variable, even if that is subsequently
+            // nulled out, the garbage collect can be delayed.
             TestScene scene = SceneHelpers.SetupScene();
 
 //            Process process = Process.GetCurrentProcess();
diff --git a/OpenSim/Tests/Torture/ScriptTortureTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs
index 87932cb..2ef55b3 100644
--- a/OpenSim/Tests/Torture/ScriptTortureTests.cs
+++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs
@@ -95,6 +95,7 @@ namespace OpenSim.Tests.Torture
         public void TearDown()
         {
             m_scene.Close();
+            m_scene = null;
             GC.Collect();
             GC.WaitForPendingFinalizers();
         }
-- 
cgit v1.1