diff options
author | Justin Clark-Casey (justincc) | 2011-04-15 01:26:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-15 01:26:07 +0100 |
commit | ba73df39a3824a91ffc848d9b6dc2356d1b307cf (patch) | |
tree | 0d67241cfe3c4e0d756043f672c82ebf05413c50 | |
parent | remove mock asset service for tests in favour of always using the real one (diff) | |
download | opensim-SC_OLD-ba73df39a3824a91ffc848d9b6dc2356d1b307cf.zip opensim-SC_OLD-ba73df39a3824a91ffc848d9b6dc2356d1b307cf.tar.gz opensim-SC_OLD-ba73df39a3824a91ffc848d9b6dc2356d1b307cf.tar.bz2 opensim-SC_OLD-ba73df39a3824a91ffc848d9b6dc2356d1b307cf.tar.xz |
remove any reference to a mock authentication service since it doesn't exist and we don't use it
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 19 |
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); |