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

out where that pesky deadlock is during test runs.

2 files changed, 11 insertions, 0 deletions

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";