2 files changed, 21 insertions, 3 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 328cd2b..eea68c3 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -50,7 +50,8 @@ namespace OpenSim.Tests.Common.Mock
 
         ~TestScene()
         {
-            Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName);
+            //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName);
+            Console.WriteLine("TestScene destructor called");
         }
         
         /// <summary>
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs
index 74b336e..e83186a 100644
--- a/OpenSim/Tests/Torture/ObjectTortureTests.cs
+++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs
@@ -49,6 +49,13 @@ namespace OpenSim.Tests.Torture
     [TestFixture]
     public class ObjectTortureTests
     {
+        [TearDown]
+        public void TearDown()
+        {
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+        }
+
 //        [Test]
 //        public void Test0000Clean()
 //        {
@@ -141,8 +148,18 @@ namespace OpenSim.Tests.Torture
                     string.Format("Object {0} could not be retrieved", i));
             }
 
-            // This does not work to fire the SceneObjectGroup destructors - something else is hanging on to them.
-//            scene.DeleteAllSceneObjects();
+            // When a scene object is added to a scene, it is placed in the update list for sending to viewers
+            // (though in this case we have none).  When it is deleted, it is not removed from the update which is
+            // fine since it will later be ignored.
+            //
+            // However, that means that we need to manually run an update here to clear out that list so that deleted
+            // objects will be clean up by the garbage collector before the next stress test is run.
+            scene.Update();
+
+            // Currently, we need to do this in order to garbage collect the scene objects ready for the next test run.
+            // However, what we really need to do is find out why the entire scene is not garbage collected in
+            // teardown.
+            scene.DeleteAllSceneObjects();
 
             Console.WriteLine(
                 "Took {0}ms, {1}MB ({2} - {3}) to create {4} objects each containing {5} prim(s)",