Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge

1 files changed, 14 insertions, 8 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 74d91d4..ec8a414 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -45,12 +45,11 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
     [TestFixture]
     public class EventQueueTests
     {
-        [Test]
-        public void AddForClient()
-        {
-            TestHelpers.InMethod();
-            log4net.Config.XmlConfigurator.Configure();
+        private TestScene m_scene;
 
+        [SetUp]
+        public void SetUp()
+        {
             MainServer.Instance = new BaseHttpServer(9999, false, 9998, "");
 
             IConfigSource config = new IniConfigSource();
@@ -60,10 +59,17 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             CapabilitiesModule capsModule = new CapabilitiesModule();
             EventQueueGetModule eqgModule = new EventQueueGetModule();
 
-            TestScene scene = SceneHelpers.SetupScene();
-            SceneHelpers.SetupSceneModules(scene, config, capsModule, eqgModule);
+            m_scene = SceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
+        }
+
+        [Test]
+        public void AddForClient()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
 
-            SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 
             // TODO: Add more assertions for the other aspects of event queues
             Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1));