aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-16 12:14:49 -0400
committerTeravus Ovares (Dan Olivares)2009-08-16 12:14:49 -0400
commit5e391b9f7c62e0d9328d09135521f65400e31283 (patch)
treea6850ef0fe27e4a72623f36a2b2730cd983d018a /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
parent* minor: comments (diff)
downloadopensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.zip
opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.tar.gz
opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.tar.bz2
opensim-SC_OLD-5e391b9f7c62e0d9328d09135521f65400e31283.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index b1b32cc..f418252 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Tests.Common.Setup
154 TestScene testScene = new TestScene( 154 TestScene testScene = new TestScene(
155 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); 155 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
156 156
157 INonSharedRegionModule capsModule = new CapabilitiesModule(); 157 INonSharedRegionModule capsModule = new CapabilitiesModule();
158 capsModule.Initialise(new IniConfigSource()); 158 capsModule.Initialise(new IniConfigSource());
159 testScene.AddRegionModule(capsModule.Name, capsModule); 159 testScene.AddRegionModule(capsModule.Name, capsModule);
160 capsModule.AddRegion(testScene); 160 capsModule.AddRegion(testScene);
@@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup
163 godsModule.Initialise(testScene, new IniConfigSource()); 163 godsModule.Initialise(testScene, new IniConfigSource());
164 testScene.AddModule(godsModule.Name, godsModule); 164 testScene.AddModule(godsModule.Name, godsModule);
165 realServices = realServices.ToLower(); 165 realServices = realServices.ToLower();
166 IniConfigSource config = new IniConfigSource(); 166 IConfigSource config = new IniConfigSource();
167 167
168 // If we have a brand new scene, need to initialize shared region modules 168 // If we have a brand new scene, need to initialize shared region modules
169 if ((m_assetService == null && m_inventoryService == null) || newScene) 169 if ((m_assetService == null && m_inventoryService == null) || newScene)
@@ -198,7 +198,7 @@ namespace OpenSim.Tests.Common.Setup
198 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 198 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
199 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); 199 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
200 testScene.PhysicsScene 200 testScene.PhysicsScene
201 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test"); 201 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
202 202
203 return testScene; 203 return testScene;
204 } 204 }
@@ -206,7 +206,7 @@ namespace OpenSim.Tests.Common.Setup
206 private static void StartAssetService(Scene testScene, bool real) 206 private static void StartAssetService(Scene testScene, bool real)
207 { 207 {
208 ISharedRegionModule assetService = new LocalAssetServicesConnector(); 208 ISharedRegionModule assetService = new LocalAssetServicesConnector();
209 IniConfigSource config = new IniConfigSource(); 209 IConfigSource config = new IniConfigSource();
210 config.AddConfig("Modules"); 210 config.AddConfig("Modules");
211 config.AddConfig("AssetService"); 211 config.AddConfig("AssetService");
212 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); 212 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
@@ -225,7 +225,7 @@ namespace OpenSim.Tests.Common.Setup
225 private static void StartInventoryService(Scene testScene, bool real) 225 private static void StartInventoryService(Scene testScene, bool real)
226 { 226 {
227 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector(); 227 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
228 IniConfigSource config = new IniConfigSource(); 228 IConfigSource config = new IniConfigSource();
229 config.AddConfig("Modules"); 229 config.AddConfig("Modules");
230 config.AddConfig("InventoryService"); 230 config.AddConfig("InventoryService");
231 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); 231 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
@@ -418,4 +418,5 @@ namespace OpenSim.Tests.Common.Setup
418 sogd.InventoryDeQueueAndDelete(); 418 sogd.InventoryDeQueueAndDelete();
419 } 419 }
420 } 420 }
421
421} 422}