diff options
Diffstat (limited to 'OpenSim/Tests/Torture/NPCTortureTests.cs')
-rw-r--r-- | OpenSim/Tests/Torture/NPCTortureTests.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Tests/Torture/NPCTortureTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs index 8078d9d..0224505 100644 --- a/OpenSim/Tests/Torture/NPCTortureTests.cs +++ b/OpenSim/Tests/Torture/NPCTortureTests.cs | |||
@@ -75,6 +75,11 @@ namespace OpenSim.Tests.Torture | |||
75 | [TestFixtureTearDown] | 75 | [TestFixtureTearDown] |
76 | public void TearDown() | 76 | public void TearDown() |
77 | { | 77 | { |
78 | scene.Close(); | ||
79 | scene = null; | ||
80 | GC.Collect(); | ||
81 | GC.WaitForPendingFinalizers(); | ||
82 | |||
78 | // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple | 83 | // 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. | 84 | // threads. Possibly, later tests should be rewritten not to worry about such things. |
80 | Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod; | 85 | Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod; |
@@ -98,7 +103,7 @@ namespace OpenSim.Tests.Torture | |||
98 | } | 103 | } |
99 | 104 | ||
100 | [Test] | 105 | [Test] |
101 | public void TestAddRemove100NPCs() | 106 | public void Test_0001_AddRemove100NPCs() |
102 | { | 107 | { |
103 | TestHelpers.InMethod(); | 108 | TestHelpers.InMethod(); |
104 | // log4net.Config.XmlConfigurator.Configure(); | 109 | // log4net.Config.XmlConfigurator.Configure(); |
@@ -107,7 +112,7 @@ namespace OpenSim.Tests.Torture | |||
107 | } | 112 | } |
108 | 113 | ||
109 | [Test] | 114 | [Test] |
110 | public void TestAddRemove1000NPCs() | 115 | public void Test_0002_AddRemove1000NPCs() |
111 | { | 116 | { |
112 | TestHelpers.InMethod(); | 117 | TestHelpers.InMethod(); |
113 | // log4net.Config.XmlConfigurator.Configure(); | 118 | // log4net.Config.XmlConfigurator.Configure(); |
@@ -116,7 +121,7 @@ namespace OpenSim.Tests.Torture | |||
116 | } | 121 | } |
117 | 122 | ||
118 | [Test] | 123 | [Test] |
119 | public void TestAddRemove2000NPCs() | 124 | public void Test_0003_AddRemove2000NPCs() |
120 | { | 125 | { |
121 | TestHelpers.InMethod(); | 126 | TestHelpers.InMethod(); |
122 | // log4net.Config.XmlConfigurator.Configure(); | 127 | // log4net.Config.XmlConfigurator.Configure(); |