aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 3bd43b4..018cf88 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -50,13 +50,21 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
50 [TestFixture] 50 [TestFixture]
51 public class NPCModuleTests 51 public class NPCModuleTests
52 { 52 {
53 [SetUp] 53 [TestFixtureSetUp]
54 public void Init() 54 public void FixtureInit()
55 { 55 {
56 // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread. 56 // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread.
57 Util.FireAndForgetMethod = FireAndForgetMethod.None; 57 Util.FireAndForgetMethod = FireAndForgetMethod.None;
58 } 58 }
59 59
60 [TestFixtureTearDown]
61 public void TearDown()
62 {
63 // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
64 // threads. Possibly, later tests should be rewritten not to worry about such things.
65 Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
66 }
67
60 [Test] 68 [Test]
61 public void TestCreate() 69 public void TestCreate()
62 { 70 {