aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Torture/NPCTortureTests.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-07 00:31:18 +0000
committerJustin Clark-Casey (justincc)2012-03-07 00:31:18 +0000
commitf3678d217f7b1d69faf4aaeb0097348f3d7f91b6 (patch)
tree8b011b384366a99b7759f230abed9c4c26a4fbf9 /OpenSim/Tests/Torture/NPCTortureTests.cs
parentAdd documentation to make more explicit the difference between OnRezScript an... (diff)
downloadopensim-SC_OLD-f3678d217f7b1d69faf4aaeb0097348f3d7f91b6.zip
opensim-SC_OLD-f3678d217f7b1d69faf4aaeb0097348f3d7f91b6.tar.gz
opensim-SC_OLD-f3678d217f7b1d69faf4aaeb0097348f3d7f91b6.tar.bz2
opensim-SC_OLD-f3678d217f7b1d69faf4aaeb0097348f3d7f91b6.tar.xz
Stop individually deleting objects at the end of each ObjectTortureTest.
We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests. This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in). Slightly simplifies config read in Scene constructor to help facilitate this.
Diffstat (limited to 'OpenSim/Tests/Torture/NPCTortureTests.cs')
-rw-r--r--OpenSim/Tests/Torture/NPCTortureTests.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Tests/Torture/NPCTortureTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs
index 8078d9d..65732db 100644
--- a/OpenSim/Tests/Torture/NPCTortureTests.cs
+++ b/OpenSim/Tests/Torture/NPCTortureTests.cs
@@ -75,6 +75,10 @@ namespace OpenSim.Tests.Torture
75 [TestFixtureTearDown] 75 [TestFixtureTearDown]
76 public void TearDown() 76 public void TearDown()
77 { 77 {
78 scene.Close();
79 GC.Collect();
80 GC.WaitForPendingFinalizers();
81
78 // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple 82 // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
79 // threads. Possibly, later tests should be rewritten not to worry about such things. 83 // threads. Possibly, later tests should be rewritten not to worry about such things.
80 Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod; 84 Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;