aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Torture
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-07 01:11:37 +0000
committerJustin Clark-Casey (justincc)2012-03-07 01:11:37 +0000
commit6bdea15ecf6fdaaf705704dddf9199b882675963 (patch)
treea53847864967258081dde6b4fa1206426ee11592 /OpenSim/Tests/Torture
parentStop individually deleting objects at the end of each ObjectTortureTest. (diff)
downloadopensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.zip
opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.tar.gz
opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.tar.bz2
opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.tar.xz
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
Diffstat (limited to 'OpenSim/Tests/Torture')
-rw-r--r--OpenSim/Tests/Torture/NPCTortureTests.cs7
-rw-r--r--OpenSim/Tests/Torture/ObjectTortureTests.cs15
-rw-r--r--OpenSim/Tests/Torture/ScriptTortureTests.cs1
3 files changed, 14 insertions, 9 deletions
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
76 public void TearDown() 76 public void TearDown()
77 { 77 {
78 scene.Close(); 78 scene.Close();
79 scene = null;
79 GC.Collect(); 80 GC.Collect();
80 GC.WaitForPendingFinalizers(); 81 GC.WaitForPendingFinalizers();
81 82
@@ -102,7 +103,7 @@ namespace OpenSim.Tests.Torture
102 } 103 }
103 104
104 [Test] 105 [Test]
105 public void TestAddRemove100NPCs() 106 public void Test_0001_AddRemove100NPCs()
106 { 107 {
107 TestHelpers.InMethod(); 108 TestHelpers.InMethod();
108// log4net.Config.XmlConfigurator.Configure(); 109// log4net.Config.XmlConfigurator.Configure();
@@ -111,7 +112,7 @@ namespace OpenSim.Tests.Torture
111 } 112 }
112 113
113 [Test] 114 [Test]
114 public void TestAddRemove1000NPCs() 115 public void Test_0002_AddRemove1000NPCs()
115 { 116 {
116 TestHelpers.InMethod(); 117 TestHelpers.InMethod();
117// log4net.Config.XmlConfigurator.Configure(); 118// log4net.Config.XmlConfigurator.Configure();
@@ -120,7 +121,7 @@ namespace OpenSim.Tests.Torture
120 } 121 }
121 122
122 [Test] 123 [Test]
123 public void TestAddRemove2000NPCs() 124 public void Test_0003_AddRemove2000NPCs()
124 { 125 {
125 TestHelpers.InMethod(); 126 TestHelpers.InMethod();
126// log4net.Config.XmlConfigurator.Configure(); 127// 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
66// } 66// }
67 67
68 [Test] 68 [Test]
69 public void Test0001_10K_1PrimObjects() 69 public void Test_0001_10K_1PrimObjects()
70 { 70 {
71 TestHelpers.InMethod(); 71 TestHelpers.InMethod();
72// log4net.Config.XmlConfigurator.Configure(); 72// log4net.Config.XmlConfigurator.Configure();
@@ -75,7 +75,7 @@ namespace OpenSim.Tests.Torture
75 } 75 }
76 76
77 [Test] 77 [Test]
78 public void Test0002_100K_1PrimObjects() 78 public void Test_0002_100K_1PrimObjects()
79 { 79 {
80 TestHelpers.InMethod(); 80 TestHelpers.InMethod();
81// log4net.Config.XmlConfigurator.Configure(); 81// log4net.Config.XmlConfigurator.Configure();
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Torture
84 } 84 }
85 85
86 [Test] 86 [Test]
87 public void Test0003_200K_1PrimObjects() 87 public void Test_0003_200K_1PrimObjects()
88 { 88 {
89 TestHelpers.InMethod(); 89 TestHelpers.InMethod();
90// log4net.Config.XmlConfigurator.Configure(); 90// log4net.Config.XmlConfigurator.Configure();
@@ -93,7 +93,7 @@ namespace OpenSim.Tests.Torture
93 } 93 }
94 94
95 [Test] 95 [Test]
96 public void Test0011_100_100PrimObjects() 96 public void Test_0011_100_100PrimObjects()
97 { 97 {
98 TestHelpers.InMethod(); 98 TestHelpers.InMethod();
99// log4net.Config.XmlConfigurator.Configure(); 99// log4net.Config.XmlConfigurator.Configure();
@@ -102,7 +102,7 @@ namespace OpenSim.Tests.Torture
102 } 102 }
103 103
104 [Test] 104 [Test]
105 public void Test0012_1K_100PrimObjects() 105 public void Test_0012_1K_100PrimObjects()
106 { 106 {
107 TestHelpers.InMethod(); 107 TestHelpers.InMethod();
108// log4net.Config.XmlConfigurator.Configure(); 108// log4net.Config.XmlConfigurator.Configure();
@@ -111,7 +111,7 @@ namespace OpenSim.Tests.Torture
111 } 111 }
112 112
113 [Test] 113 [Test]
114 public void Test0013_2K_100PrimObjects() 114 public void Test_0013_2K_100PrimObjects()
115 { 115 {
116 TestHelpers.InMethod(); 116 TestHelpers.InMethod();
117// log4net.Config.XmlConfigurator.Configure(); 117// log4net.Config.XmlConfigurator.Configure();
@@ -123,6 +123,9 @@ namespace OpenSim.Tests.Torture
123 { 123 {
124 UUID ownerId = new UUID("F0000000-0000-0000-0000-000000000000"); 124 UUID ownerId = new UUID("F0000000-0000-0000-0000-000000000000");
125 125
126 // Using a local variable for scene, at least on mono 2.6.7, means that it's much more likely to be garbage
127 // collected when we teardown this test. If it's done in a member variable, even if that is subsequently
128 // nulled out, the garbage collect can be delayed.
126 TestScene scene = SceneHelpers.SetupScene(); 129 TestScene scene = SceneHelpers.SetupScene();
127 130
128// Process process = Process.GetCurrentProcess(); 131// 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
95 public void TearDown() 95 public void TearDown()
96 { 96 {
97 m_scene.Close(); 97 m_scene.Close();
98 m_scene = null;
98 GC.Collect(); 99 GC.Collect();
99 GC.WaitForPendingFinalizers(); 100 GC.WaitForPendingFinalizers();
100 } 101 }