diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Torture/NPCTortureTests.cs')
-rw-r--r-- | OpenSim/Tests/Torture/NPCTortureTests.cs | 7 |
1 files changed, 4 insertions, 3 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(); |