aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs19
1 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 27d1a69..4a356e2 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Setup
191 if (realServices.Contains("grid")) 191 if (realServices.Contains("grid"))
192 StartGridService(testScene, true); 192 StartGridService(testScene, true);
193 193
194 StartUserAccountService(testScene, realServices.Contains("useraccounts")); 194 StartUserAccountService(testScene);
195 } 195 }
196 // If not, make sure the shared module gets references to this new scene 196 // If not, make sure the shared module gets references to this new scene
197 else 197 else
@@ -311,24 +311,18 @@ namespace OpenSim.Tests.Common.Setup
311 } 311 }
312 312
313 /// <summary> 313 /// <summary>
314 /// Start a user account service, whether real or mock 314 /// Start a user account service
315 /// </summary> 315 /// </summary>
316 /// <param name="testScene"></param> 316 /// <param name="testScene"></param>
317 /// <param name="real">Starts a real service if true, a mock service if not</param> 317 private static void StartUserAccountService(Scene testScene)
318 private static void StartUserAccountService(Scene testScene, bool real)
319 { 318 {
320 IConfigSource config = new IniConfigSource(); 319 IConfigSource config = new IniConfigSource();
321 config.AddConfig("Modules"); 320 config.AddConfig("Modules");
322 config.AddConfig("UserAccountService"); 321 config.AddConfig("UserAccountService");
323 config.Configs["Modules"].Set("UserAccountServices", "LocalUserAccountServicesConnector"); 322 config.Configs["Modules"].Set("UserAccountServices", "LocalUserAccountServicesConnector");
324 config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 323 config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
325 324 config.Configs["UserAccountService"].Set(
326 if (real) 325 "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
327 config.Configs["UserAccountService"].Set(
328 "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
329 else
330 config.Configs["UserAccountService"].Set(
331 "LocalServiceModule", "OpenSim.Tests.Common.dll:MockUserAccountService");
332 326
333 if (m_userAccountService == null) 327 if (m_userAccountService == null)
334 { 328 {
@@ -336,8 +330,7 @@ namespace OpenSim.Tests.Common.Setup
336 userAccountService.Initialise(config); 330 userAccountService.Initialise(config);
337 m_userAccountService = userAccountService; 331 m_userAccountService = userAccountService;
338 } 332 }
339 //else 333
340 // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
341 m_userAccountService.AddRegion(testScene); 334 m_userAccountService.AddRegion(testScene);
342 m_userAccountService.RegionLoaded(testScene); 335 m_userAccountService.RegionLoaded(testScene);
343 testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService); 336 testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService);