aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorSean Dague2009-05-07 19:07:08 +0000
committerSean Dague2009-05-07 19:07:08 +0000
commitce0a84cbc0e277dd5be08a20febf13364a985a3a (patch)
treed5fc2dda5eaf3674c67d82198efd04323f1ba7a5 /OpenSim/Region/Framework
parentRemoteAdminPlugin was using a mixture of both "true"/"false" and 0/1 (diff)
downloadopensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.zip
opensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.gz
opensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.bz2
opensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.xz
instrument most of the tests with a new InMethod function that may help us figure
out where that pesky deadlock is during test runs.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs21
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs2
5 files changed, 23 insertions, 17 deletions
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
52 [Test] 52 [Test]
53 public void T010_AddObjects() 53 public void T010_AddObjects()
54 { 54 {
55 TestHelper.InMethod();
55 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
56 57
57 random = new Random(); 58 random = new Random();
@@ -87,6 +88,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
87 [Test] 88 [Test]
88 public void T011_ThreadAddRemoveTest() 89 public void T011_ThreadAddRemoveTest()
89 { 90 {
91 TestHelper.InMethod();
90 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 92 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
91 93
92 // This test adds and removes with mutiple threads, attempting to break the 94 // 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
53 [Test, LongRunning] 53 [Test, LongRunning]
54 public void TestAddSceneObject() 54 public void TestAddSceneObject()
55 { 55 {
56 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 TestHelper.InMethod();
57 57
58 Scene scene = SceneSetupHelpers.SetupScene(); 58 Scene scene = SceneSetupHelpers.SetupScene();
59 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 59 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
60 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 60 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
70 [Test] 70 [Test]
71 public void TestDeleteSceneObject() 71 public void TestDeleteSceneObject()
72 { 72 {
73 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 73 TestHelper.InMethod();
74 74
75 TestScene scene = SceneSetupHelpers.SetupScene(); 75 TestScene scene = SceneSetupHelpers.SetupScene();
76 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 76 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
86 [Test] 86 [Test]
87 public void TestDeleteSceneObjectAsync() 87 public void TestDeleteSceneObjectAsync()
88 { 88 {
89 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 89 TestHelper.InMethod();
90 90
91 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); 91 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
92 92
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
115 [Test] 115 [Test]
116 public void TestDeleteSceneObjectAsyncToUserInventory() 116 public void TestDeleteSceneObjectAsyncToUserInventory()
117 { 117 {
118 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 118 TestHelper.InMethod();
119 //log4net.Config.XmlConfigurator.Configure(); 119 //log4net.Config.XmlConfigurator.Configure();
120 120
121 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); 121 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;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Communications.Local; 36using OpenSim.Region.Communications.Local;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Tests.Common;
38using OpenSim.Tests.Common.Mock; 39using OpenSim.Tests.Common.Mock;
39using OpenSim.Tests.Common.Setup; 40using OpenSim.Tests.Common.Setup;
40using log4net; 41using log4net;
@@ -52,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
52 [Test] 53 [Test]
53 public void TestLinkDelink2SceneObjects() 54 public void TestLinkDelink2SceneObjects()
54 { 55 {
55 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 TestHelper.InMethod();
56 57
57 bool debugtest = false; 58 bool debugtest = false;
58 59
@@ -130,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
130 [Test] 131 [Test]
131 public void TestLinkDelink2groups4SceneObjects() 132 public void TestLinkDelink2groups4SceneObjects()
132 { 133 {
133 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 134 TestHelper.InMethod();
134 135
135 bool debugtest = false; 136 bool debugtest = false;
136 137
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;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; 43using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
44using OpenSim.Region.CoreModules.World.Serialiser; 44using OpenSim.Region.CoreModules.World.Serialiser;
45using OpenSim.Tests.Common;
45using OpenSim.Tests.Common.Mock; 46using OpenSim.Tests.Common.Mock;
46using OpenSim.Tests.Common.Setup; 47using OpenSim.Tests.Common.Setup;
47 48
@@ -99,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
99 [Test] 100 [Test]
100 public void T010_TestAddRootAgent() 101 public void T010_TestAddRootAgent()
101 { 102 {
102 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 103 TestHelper.InMethod();
103 104
104 string firstName = "testfirstname"; 105 string firstName = "testfirstname";
105 106
@@ -133,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
133 [Test] 134 [Test]
134 public void T011_TestRemoveRootAgent() 135 public void T011_TestRemoveRootAgent()
135 { 136 {
136 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 137 TestHelper.InMethod();
137 138
138 scene.RemoveClient(agent1); 139 scene.RemoveClient(agent1);
139 140
@@ -145,7 +146,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
145 [Test] 146 [Test]
146 public void T012_TestAddNeighbourRegion() 147 public void T012_TestAddNeighbourRegion()
147 { 148 {
148 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 149 TestHelper.InMethod();
149 150
150 string reason; 151 string reason;
151 scene.NewUserConnection(acd1, out reason); 152 scene.NewUserConnection(acd1, out reason);
@@ -167,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
167 [Test] 168 [Test]
168 public void T013_TestRemoveNeighbourRegion() 169 public void T013_TestRemoveNeighbourRegion()
169 { 170 {
170 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 171 TestHelper.InMethod();
171 172
172 ScenePresence presence = scene.GetScenePresence(agent1); 173 ScenePresence presence = scene.GetScenePresence(agent1);
173 presence.RemoveNeighbourRegion(region3); 174 presence.RemoveNeighbourRegion(region3);
@@ -184,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
184 [Test] 185 [Test]
185 public void T020_TestMakeRootAgent() 186 public void T020_TestMakeRootAgent()
186 { 187 {
187 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 188 TestHelper.InMethod();
188 189
189 ScenePresence presence = scene.GetScenePresence(agent1); 190 ScenePresence presence = scene.GetScenePresence(agent1);
190 Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent"); 191 Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent");
@@ -202,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
202 [Test] 203 [Test]
203 public void T021_TestCrossToNewRegion() 204 public void T021_TestCrossToNewRegion()
204 { 205 {
205 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 206 TestHelper.InMethod();
206 207
207 // Adding child agent to region 1001 208 // Adding child agent to region 1001
208 string reason; 209 string reason;
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
295 [Test] 296 [Test]
296 public void T030_TestAddAttachments() 297 public void T030_TestAddAttachments()
297 { 298 {
298 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 299 TestHelper.InMethod();
299 300
300 ScenePresence presence = scene.GetScenePresence(agent1); 301 ScenePresence presence = scene.GetScenePresence(agent1);
301 302
@@ -310,7 +311,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
310 [Test] 311 [Test]
311 public void T031_RemoveAttachments() 312 public void T031_RemoveAttachments()
312 { 313 {
313 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 314 TestHelper.InMethod();
314 315
315 ScenePresence presence = scene.GetScenePresence(agent1); 316 ScenePresence presence = scene.GetScenePresence(agent1);
316 presence.RemoveAttachment(sog1); 317 presence.RemoveAttachment(sog1);
@@ -322,7 +323,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
322 [Test] 323 [Test]
323 public void T032_CrossAttachments() 324 public void T032_CrossAttachments()
324 { 325 {
325 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 326 TestHelper.InMethod();
326 327
327 ScenePresence presence = scene.GetScenePresence(agent1); 328 ScenePresence presence = scene.GetScenePresence(agent1);
328 ScenePresence presence2 = scene2.GetScenePresence(agent1); 329 ScenePresence presence2 = scene2.GetScenePresence(agent1);
@@ -342,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
342 343
343 public static string GetRandomCapsObjectPath() 344 public static string GetRandomCapsObjectPath()
344 { 345 {
345 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 346 TestHelper.InMethod();
346 347
347 UUID caps = UUID.Random(); 348 UUID caps = UUID.Random();
348 string capsPath = caps.ToString(); 349 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
54 [Test, LongRunning] 54 [Test, LongRunning]
55 public void TestSimpleNotNeighboursTeleport() 55 public void TestSimpleNotNeighboursTeleport()
56 { 56 {
57 TestHelper.InMethod();
58
57 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 59 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
58 60
59 log4net.Config.XmlConfigurator.Configure(); 61 log4net.Config.XmlConfigurator.Configure();