diff options
author | Justin Clark-Casey (justincc) | 2009-08-14 20:38:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-08-14 20:38:56 +0100 |
commit | e17a2331a02d36a3b9f6f37630601ab4a63a4fb2 (patch) | |
tree | a22e0a3530725048ccdc4877d6fec003690ffd6f /OpenSim/Region/CoreModules/Avatar | |
parent | Re-enable TestSaveIarV0_1() (diff) | |
download | opensim-SC-e17a2331a02d36a3b9f6f37630601ab4a63a4fb2.zip opensim-SC-e17a2331a02d36a3b9f6f37630601ab4a63a4fb2.tar.gz opensim-SC-e17a2331a02d36a3b9f6f37630601ab4a63a4fb2.tar.bz2 opensim-SC-e17a2331a02d36a3b9f6f37630601ab4a63a4fb2.tar.xz |
* Re-enable TestLoadIarV0_1ExistingUsers()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index c66678f..470a386 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
222 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where | 222 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where |
223 | /// an account exists with the creator name. | 223 | /// an account exists with the creator name. |
224 | /// </summary> | 224 | /// </summary> |
225 | //[Test] | 225 | [Test] |
226 | public void TestLoadIarV0_1ExistingUsers() | 226 | public void TestLoadIarV0_1ExistingUsers() |
227 | { | 227 | { |
228 | TestHelper.InMethod(); | 228 | TestHelper.InMethod(); |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
262 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); | 262 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
263 | 263 | ||
264 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene | 264 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene |
265 | Scene scene = SceneSetupHelpers.SetupScene(); | 265 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
266 | IUserAdminService userAdminService = scene.CommsManager.UserAdminService; | 266 | IUserAdminService userAdminService = scene.CommsManager.UserAdminService; |
267 | 267 | ||
268 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 268 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
@@ -276,16 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
276 | 276 | ||
277 | CachedUserInfo userInfo | 277 | CachedUserInfo userInfo |
278 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); | 278 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); |
279 | //userInfo.FetchInventory(); | 279 | |
280 | /* | ||
281 | for (int i = 0 ; i < 50 ; i++) | ||
282 | { | ||
283 | if (userInfo.HasReceivedInventory == true) | ||
284 | break; | ||
285 | Thread.Sleep(200); | ||
286 | } | ||
287 | Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)"); | ||
288 | */ | ||
289 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); | 280 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); |
290 | Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item"); | 281 | Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item"); |
291 | Assert.That( | 282 | Assert.That( |