OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Another attempt at fixing the random spurious test error. 

* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception.   Hopefully calling Stop() on MainServer.Instance will solve that.
remotes/origin/0.6.7-post-fixes
Teravus Ovares (Dan Olivares) 2009-08-26 21:05:46 -04:00
parent b7041d7adf
commit 6f077d5e5f
6 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
View File

@ -330,5 +330,16 @@ namespace OpenSim.Framework.Communications.Tests
Assert.That(rootFolder.RequestListOfFolders(), Is.Empty);
Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
}
[TearDown]
public void TearDown()
{
try
{
if (MainServer.Instance != null) MainServer.Instance.Stop();
}
catch (System.NullReferenceException)
{ }
}
}
}

10
OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
View File

@ -362,6 +362,16 @@ namespace OpenSim.Framework.Communications.Tests
//Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()");
}
[TearDown]
public void TearDown()
{
try
{
if (MainServer.Instance != null) MainServer.Instance.Stop();
} catch (NullReferenceException)
{}
}
public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector
{
private List<RegionInfo> m_regionsList = new List<RegionInfo>();

17
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -1637,13 +1637,20 @@ namespace OpenSim.Framework.Servers.HttpServer
public void Stop()
{
HTTPDRunning = false;
m_httpListener2.ExceptionThrown -= httpServerException;
//m_httpListener2.DisconnectHandler = null;
try
{
m_httpListener2.ExceptionThrown -= httpServerException;
//m_httpListener2.DisconnectHandler = null;
m_httpListener2.LogWriter = null;
m_httpListener2.RequestReceived -= OnRequest;
m_httpListener2.LogWriter = null;
m_httpListener2.RequestReceived -= OnRequest;
m_httpListener2.Stop();
}
catch (NullReferenceException)
{
m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");
}
m_httpListener2.Stop();
}
public void RemoveStreamHandler(string httpMethod, string path)

6
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
View File

@ -378,6 +378,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects");
}
[TearDown]
public void TearDown()
{
if (MainServer.Instance != null) MainServer.Instance.Stop();
}
public static string GetRandomCapsObjectPath()
{
TestHelper.InMethod();

11
OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
View File

@ -78,6 +78,17 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
}
[TearDown]
public void TearDown()
{
try
{
if (MainServer.Instance != null) MainServer.Instance.Stop();
}
catch (NullReferenceException)
{ }
}
}
public class ThreadRunResults

9
prebuild.xml
View File

@ -3181,6 +3181,7 @@
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="Nini.dll" />
<Reference name="log4net.dll"/>
@ -3245,7 +3246,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Xml"/>
<Reference name="System.Core"/>
<Reference name="System.Core"/>
<Reference name="System.Drawing"/>
<Reference name="System.Data"/>
<Reference name="OpenMetaverse.dll"/>
@ -3254,7 +3255,7 @@
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Tests.Common"/>
<Reference name="OpenSim.Tests.Common"/>
<Reference name="log4net.dll"/>
<Reference name="Mono.Addins.dll" />
<Reference name="nunit.framework.dll" />
@ -3397,6 +3398,7 @@
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Tests.Common"/>
<Reference name="Nini.dll" />
<Reference name="nunit.framework.dll" />
@ -3488,6 +3490,7 @@
<Reference name="OpenSim.Client.Linden"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Region.Framework"/>
@ -3524,6 +3527,7 @@
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Framework"/>
@ -3585,6 +3589,7 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>