aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs19
1 files changed, 7 insertions, 12 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 484a97d..b819581 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -132,11 +132,8 @@ namespace OpenSim.Tests.Common.Setup
132 testScene.AddModule(godsModule.Name, godsModule); 132 testScene.AddModule(godsModule.Name, godsModule);
133 realServices = realServices.ToLower(); 133 realServices = realServices.ToLower();
134 134
135 LocalAssetServicesConnector assetService = StartAssetService(testScene); 135 LocalAssetServicesConnector assetService = StartAssetService(testScene);
136 136 StartAuthenticationService(testScene);
137 // For now, always started a 'real' authentication service
138 StartAuthenticationService(testScene, true);
139
140 LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene); 137 LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
141 StartGridService(testScene, true); 138 StartGridService(testScene, true);
142 LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene); 139 LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
@@ -183,20 +180,18 @@ namespace OpenSim.Tests.Common.Setup
183 return assetService; 180 return assetService;
184 } 181 }
185 182
186 private static void StartAuthenticationService(Scene testScene, bool real) 183 private static void StartAuthenticationService(Scene testScene)
187 { 184 {
188 ISharedRegionModule service = new LocalAuthenticationServicesConnector(); 185 ISharedRegionModule service = new LocalAuthenticationServicesConnector();
189 IConfigSource config = new IniConfigSource(); 186 IConfigSource config = new IniConfigSource();
187
190 config.AddConfig("Modules"); 188 config.AddConfig("Modules");
191 config.AddConfig("AuthenticationService"); 189 config.AddConfig("AuthenticationService");
192 config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector"); 190 config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector");
193 if (real) 191 config.Configs["AuthenticationService"].Set(
194 config.Configs["AuthenticationService"].Set( 192 "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
195 "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
196 else
197 config.Configs["AuthenticationService"].Set(
198 "LocalServiceModule", "OpenSim.Tests.Common.dll:MockAuthenticationService");
199 config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 193 config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
194
200 service.Initialise(config); 195 service.Initialise(config);
201 service.AddRegion(testScene); 196 service.AddRegion(testScene);
202 service.RegionLoaded(testScene); 197 service.RegionLoaded(testScene);