instrument most of the tests with a new InMethod function that may help us figure

out where that pesky deadlock is during test runs.

15 files changed, 91 insertions, 17 deletions

diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 2972a0a..75848b7 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Framework.Communications.Tests
 {
@@ -43,6 +44,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestGetUserDetails()
         {
+            TestHelper.InMethod();
+
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000002");
             string firstName = "Bill";
             string lastName = "Bailey";            
@@ -109,6 +112,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestFetchInventory()
         {
+            TestHelper.InMethod();
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
 
@@ -118,6 +123,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestGetChildFolder()
         {
+            TestHelper.InMethod();
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
 
@@ -132,6 +139,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestCreateFolder()
         {
+            TestHelper.InMethod();
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
 
@@ -159,6 +168,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestUpdateFolder()
         {
+            TestHelper.InMethod();
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
 
@@ -213,6 +224,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestMoveFolder()
         {
+            TestHelper.InMethod();
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
 
@@ -244,6 +257,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestPurgeFolder()
         {
+            TestHelper.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 965e6b4..7d75faa 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework.Communications.Services;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Client.Linden;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Framework.Communications.Tests
 {
@@ -45,6 +46,7 @@ namespace OpenSim.Framework.Communications.Tests
     /// Test the login service.  For now, most of this will be done through the LocalLoginService as LoginService
     /// is abstract
     /// </summary>
+
     [TestFixture]
     public class LoginServiceTests
     {
@@ -83,6 +85,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T010_TestUnauthenticatedLogin()
         {
+            TestHelper.InMethod();
             // We want to use our own LoginService for this test, one that
             // doesn't require authentication.
             LoginService loginService = new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", m_commsManager.InterServiceInventoryService,
@@ -119,6 +122,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T011_TestAuthenticatedLoginSuccess()
         {
+            TestHelper.InMethod();
             // TODO: Not check inventory part of response yet.
             // TODO: Not checking all of login response thoroughly yet.
 
@@ -168,6 +172,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T012_TestAuthenticatedLoginForBuddies()
         {
+            TestHelper.InMethod();
             // 1.1) Test for budddies!
             m_localUserServices.AddUser("Friend","Number1","boingboing","abc@ftw.com",42,43);
             m_localUserServices.AddUser("Friend","Number2","boingboing","abc@ftw.com",42,43);
@@ -207,6 +212,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T020_TestAuthenticatedLoginBadUsername()
         {
+            TestHelper.InMethod();
 
             // 2) Test for negative authentication
             //
@@ -234,6 +240,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T021_TestAuthenticatedLoginBadPassword()
         {
+            TestHelper.InMethod();
+
             string error_auth_message = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
             // 2.2) Test for wrong password
             Hashtable loginParams = new Hashtable();
@@ -257,6 +265,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T022_TestAuthenticatedLoginBadXml()
         {
+            TestHelper.InMethod();
+
             string error_xml_message = "Error connecting to grid. Could not percieve credentials from login XML.";
             // 2.3) Bad XML
             Hashtable loginParams = new Hashtable();
@@ -280,6 +290,8 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void T023_TestAuthenticatedLoginAlreadyLoggedIn()
         {
+            TestHelper.InMethod();
+
             //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");            
             //log4net.Config.XmlConfigurator.Configure();
             
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index 0b70cb1..702e66a 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using NUnit.Framework;

 using OpenSim.Data;

+using OpenSim.Tests.Common;

 

 namespace OpenSim.Framework.Servers.Tests

 {

@@ -12,12 +13,16 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestConstructor()

         {

+            TestHelper.InMethod();

+

             GetAssetStreamHandler handler = new GetAssetStreamHandler( null );

         }

 

         [Test]

         public void TestGetParams()

         {

+            TestHelper.InMethod();

+

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

             Assert.AreEqual("", handler.GetParam(null), "Failed on null path.");

@@ -36,6 +41,8 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestSplitParams()

         {

+            TestHelper.InMethod();

+

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

             Assert.AreEqual(new string[] { }, handler.SplitParams(null), "Failed on null.");

@@ -53,6 +60,8 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestHandleNoParams()

         {

+            TestHelper.InMethod();

+

             byte[] emptyResult = new byte[] {};

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

@@ -63,6 +72,8 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestHandleMalformedGuid()

         {

+            TestHelper.InMethod();

+

             byte[] emptyResult = new byte[] {};

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 80fbba2..02f78c7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -150,6 +150,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [Test, LongRunning]        
         public void TestAddClient()
         {            
+            TestHelper.InMethod();
+
             uint myCircuitCode = 123456;
             UUID myAgentUuid   = UUID.Parse("00000000-0000-0000-0000-000000000001");
             UUID mySessionUuid = UUID.Parse("00000000-0000-0000-0000-000000000002");
@@ -196,6 +198,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [Test]        
         public void TestRemoveClient()
         {
+            TestHelper.InMethod();
+
             uint myCircuitCode = 123457;     
             
             TestLLUDPServer testLLUDPServer;
@@ -218,6 +222,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [Test]
         public void TestMalformedPacketSend()
         {
+            TestHelper.InMethod();
+
             uint myCircuitCode = 123458;
             EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001);
             MockScene scene = new MockScene(); 
@@ -256,6 +262,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [Test]
         public void TestExceptionOnBeginReceive()
         {
+            TestHelper.InMethod();
+
             MockScene scene = new MockScene();
             
             uint circuitCodeA = 130000;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index 6e429a4..4ebc624 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -32,6 +32,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
@@ -47,6 +48,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         /// </summary>        
         public void InPacketTest()
         {
+            TestHelper.InMethod();
+
             AgentCircuitData agent = new AgentCircuitData();
             agent.AgentID = UUID.Random();
             agent.firstname = "testfirstname";
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index ec95187..7b3e887 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Agent.TextureSender
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         [Test]
         public void T010_SendPkg()
         {
+            TestHelper.InMethod();
             // Normal sending
             AssetBase abase = new AssetBase(uuid1, "asset one");
             byte[] abdata = new byte[testsize];
@@ -95,6 +97,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         [Test]
         public void T011_UpdateReq()
         {
+            TestHelper.InMethod();
             // Test packet number start
             AssetBase abase = new AssetBase(uuid2, "asset two");
             byte[] abdata = new byte[testsize];
@@ -143,6 +146,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         [Test]
         public void T999_FinishStatus()
         {
+            TestHelper.InMethod();
             // Of the 4 assets "sent", only 2 sent the first part.
             Assert.That(client.sentdatapkt.Count,Is.EqualTo(2));
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 4c6045a..374cea3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -68,6 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         [Test]
         public void TestSaveIarV0p1()
         {
+            TestHelper.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
@@ -201,6 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         [Test]
         public void TestLoadIarV0p1ExistingUsers()
         {   
+            TestHelper.InMethod();
             Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
             
             //log4net.Config.XmlConfigurator.Configure();
@@ -267,6 +269,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         [Test]
         public void TestLoadIarV0p1TempProfiles()
         {   
+            TestHelper.InMethod();
             Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod());
             
             log4net.Config.XmlConfigurator.Configure();
@@ -336,6 +339,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         [Test]
         public void TestReplicateArchivePathToUserInventory()
         {
+            TestHelper.InMethod();
             CommunicationsManager commsManager = new TestCommunicationsManager();            
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index af789aa..7037141 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         [Test]
         public void TestSaveOarV0p2()
         {
+            TestHelper.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
             ArchiverModule archiverModule = new ArchiverModule();
@@ -202,6 +203,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         [Test]
         public void TestLoadOarV0p2()
         {
+            TestHelper.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -277,6 +279,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         //[Test]
         public void TestMergeOarV0p2()
         {
+            TestHelper.InMethod();
             //XmlConfigurator.Configure();
 
             MemoryStream archiveWriteStream = new MemoryStream();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index d1ef686..10c2039 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T010_AddObjects()
         {
+            TestHelper.InMethod();
             // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
             
             random = new Random();
@@ -87,6 +88,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T011_ThreadAddRemoveTest()
         {   
+            TestHelper.InMethod();
             // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
             
             // This test adds and removes with mutiple threads, attempting to break the 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 5c3d653..8a17ee7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test, LongRunning]
         public void TestAddSceneObject()
         {              
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
-            
+            TestHelper.InMethod();
+
             Scene scene = SceneSetupHelpers.SetupScene();
             SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeleteSceneObject()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
             
             TestScene scene = SceneSetupHelpers.SetupScene();         
             SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeleteSceneObjectAsync()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
             
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
             
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeleteSceneObjectAsyncToUserInventory()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());            
+            TestHelper.InMethod();            
             //log4net.Config.XmlConfigurator.Configure();                  
             
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index d62ce1f..8a1fa29 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 using log4net;
@@ -52,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestLinkDelink2SceneObjects()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
             
             bool debugtest = false; 
 
@@ -130,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestLinkDelink2groups4SceneObjects()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
             
             bool debugtest = false;
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 2903766..8801176 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
 using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
@@ -99,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T010_TestAddRootAgent()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             string firstName = "testfirstname";
 
@@ -133,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T011_TestRemoveRootAgent()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             scene.RemoveClient(agent1);
 
@@ -145,7 +146,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T012_TestAddNeighbourRegion()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             string reason;
             scene.NewUserConnection(acd1, out reason);
@@ -167,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T013_TestRemoveNeighbourRegion()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             presence.RemoveNeighbourRegion(region3);
@@ -184,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T020_TestMakeRootAgent()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent");
@@ -202,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T021_TestCrossToNewRegion()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             // Adding child agent to region 1001
             string reason;
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T030_TestAddAttachments()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
 
@@ -310,7 +311,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T031_RemoveAttachments()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             presence.RemoveAttachment(sog1);
@@ -322,7 +323,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T032_CrossAttachments()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             ScenePresence presence2 = scene2.GetScenePresence(agent1);
@@ -342,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
         public static string GetRandomCapsObjectPath()
         {
-            Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestHelper.InMethod();
 
             UUID caps = UUID.Random();
             string capsPath = caps.ToString();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 2618da6..5356ae8 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -54,6 +54,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test, LongRunning]        
         public void TestSimpleNotNeighboursTeleport()
         {
+            TestHelper.InMethod();
+
             // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
             
             log4net.Config.XmlConfigurator.Configure();
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelper.cs
index 6853e55..21c2875 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelper.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Diagnostics;
 
 namespace OpenSim.Tests.Common
 {
@@ -46,5 +47,12 @@ namespace OpenSim.Tests.Common
 
             return false;
         }
+
+        // A debugging method that can be used to print out which test method you are in
+        public static void InMethod()
+        {
+            StackTrace stackTrace = new StackTrace();
+            Console.WriteLine("In Test Method : {0}", stackTrace.GetFrame(1).GetMethod().Name);
+        }
     }
 }
diff --git a/prebuild.xml b/prebuild.xml
index 5e51ff6..8e2906a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3198,6 +3198,7 @@
       <ReferencePath>../../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Tests.Common"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>