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

remove any reference to a mock authentication service since it doesn't exist and we don't use it

bulletsim
Justin Clark-Casey (justincc) 2011-04-15 01:26:07 +01:00
parent 54e8855819
commit ba73df39a3
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -132,11 +132,8 @@ namespace OpenSim.Tests.Common.Setup
testScene.AddModule(godsModule.Name, godsModule); testScene.AddModule(godsModule.Name, godsModule);
realServices = realServices.ToLower(); realServices = realServices.ToLower();
LocalAssetServicesConnector assetService = StartAssetService(testScene); LocalAssetServicesConnector assetService = StartAssetService(testScene);
StartAuthenticationService(testScene);
// For now, always started a 'real' authentication service
StartAuthenticationService(testScene, true);
LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene); LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
StartGridService(testScene, true); StartGridService(testScene, true);
LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene); LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
@ -183,20 +180,18 @@ namespace OpenSim.Tests.Common.Setup
return assetService; return assetService;
} }
private static void StartAuthenticationService(Scene testScene, bool real) private static void StartAuthenticationService(Scene testScene)
{ {
ISharedRegionModule service = new LocalAuthenticationServicesConnector(); ISharedRegionModule service = new LocalAuthenticationServicesConnector();
IConfigSource config = new IniConfigSource(); IConfigSource config = new IniConfigSource();
config.AddConfig("Modules"); config.AddConfig("Modules");
config.AddConfig("AuthenticationService"); config.AddConfig("AuthenticationService");
config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector"); config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector");
if (real) config.Configs["AuthenticationService"].Set(
config.Configs["AuthenticationService"].Set( "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
"LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
else
config.Configs["AuthenticationService"].Set(
"LocalServiceModule", "OpenSim.Tests.Common.dll:MockAuthenticationService");
config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
service.Initialise(config); service.Initialise(config);
service.AddRegion(testScene); service.AddRegion(testScene);
service.RegionLoaded(testScene); service.RegionLoaded(testScene);