* This should fix the tests failing because of a MainConsole.Instance null reference

* Added a MockConsole that doesn't require a handle to System.Console

2 files changed, 34 insertions, 2 deletions

diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
new file mode 100644
index 0000000..57c56f1
--- /dev/null
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Console
+{
+    public class MockConsole : CommandConsole
+    {
+        public MockConsole(string defaultPrompt) : base(defaultPrompt)
+        {
+        }
+        public override void Output(string text)
+        {
+        }
+        public override void Output(string text, string level)
+        {
+        }
+
+        public override string ReadLine(string p, bool isCommand, bool e)
+        {
+            //Thread.CurrentThread.Join(1000);
+            return string.Empty;
+        }
+        public override void UnlockOutput()
+        {
+        }
+        public override void LockOutput()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 864e2aa..ef8ea50 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Tests.Common.Setup
             //{
             //    System.Console.WriteLine("Starting a brand new scene");
             //    newScene = true;
-            //    MainConsole.Instance = new LocalConsole("TEST PROMPT");
+            MainConsole.Instance = new MockConsole("TEST PROMPT");
             //    MainServer.Instance = new BaseHttpServer(980);
             //    commsManager = cm;
             //}
@@ -204,7 +204,7 @@ namespace OpenSim.Tests.Common.Setup
             m_inventoryService.PostInitialise();
             m_assetService.PostInitialise();
             m_userAccountService.PostInitialise();
-
+            testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
             testScene.SetModuleInterfaces();
 
             testScene.LandChannel = new TestLandChannel(testScene);