* ShortVersion, another attempt at fixing the test thread death that randomly occurs.
* LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.arthursv
parent
4eeab4097a
commit
5e391b9f7c
|
@ -34,6 +34,7 @@ using OpenMetaverse;
|
|||
using OpenMetaverse.Packets;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Tests.Common;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.LindenUDP.Tests
|
||||
{
|
||||
|
|
|
@ -35,6 +35,7 @@ using Nini.Config;
|
|||
using OpenSim.Region.ScriptEngine.Shared.Api;
|
||||
using OpenMetaverse;
|
||||
using System;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
||||
{
|
||||
|
@ -52,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
|||
public void SetUp()
|
||||
{
|
||||
|
||||
IniConfigSource initConfigSource = new IniConfigSource();
|
||||
IConfigSource initConfigSource = new IniConfigSource();
|
||||
IConfig config = initConfigSource.AddConfig("XEngine");
|
||||
config.Set("Enabled", "true");
|
||||
|
||||
|
|
|
@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
godsModule.Initialise(testScene, new IniConfigSource());
|
||||
testScene.AddModule(godsModule.Name, godsModule);
|
||||
realServices = realServices.ToLower();
|
||||
IniConfigSource config = new IniConfigSource();
|
||||
IConfigSource config = new IniConfigSource();
|
||||
|
||||
// If we have a brand new scene, need to initialize shared region modules
|
||||
if ((m_assetService == null && m_inventoryService == null) || newScene)
|
||||
|
@ -198,7 +198,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
|
||||
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
|
||||
testScene.PhysicsScene
|
||||
= physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test");
|
||||
= physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
|
||||
|
||||
return testScene;
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
private static void StartAssetService(Scene testScene, bool real)
|
||||
{
|
||||
ISharedRegionModule assetService = new LocalAssetServicesConnector();
|
||||
IniConfigSource config = new IniConfigSource();
|
||||
IConfigSource config = new IniConfigSource();
|
||||
config.AddConfig("Modules");
|
||||
config.AddConfig("AssetService");
|
||||
config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
|
||||
|
@ -225,7 +225,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
private static void StartInventoryService(Scene testScene, bool real)
|
||||
{
|
||||
ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
|
||||
IniConfigSource config = new IniConfigSource();
|
||||
IConfigSource config = new IniConfigSource();
|
||||
config.AddConfig("Modules");
|
||||
config.AddConfig("InventoryService");
|
||||
config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
|
||||
|
@ -418,4 +418,5 @@ namespace OpenSim.Tests.Common.Setup
|
|||
sogd.InventoryDeQueueAndDelete();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue