aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authordiva2009-06-11 19:12:20 +0000
committerdiva2009-06-11 19:12:20 +0000
commit6c1d6283e62a4212b2eef97eefc3ababa0fca9e5 (patch)
tree44c0d106773fe6e1c6cb7f446826f46de6d0dbd3 /OpenSim/Region
parent* Reinstating UserProfileCacheServiceTests. One test still fails (TestUpdateF... (diff)
downloadopensim-SC-6c1d6283e62a4212b2eef97eefc3ababa0fca9e5.zip
opensim-SC-6c1d6283e62a4212b2eef97eefc3ababa0fca9e5.tar.gz
opensim-SC-6c1d6283e62a4212b2eef97eefc3ababa0fca9e5.tar.bz2
opensim-SC-6c1d6283e62a4212b2eef97eefc3ababa0fca9e5.tar.xz
Small improvement in the IAR tests, but these tests are still showing random behavior, so they are still commented out.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index e499f85..1e300f5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -85,6 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
85 cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId); 85 cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId);
86 CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId); 86 CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId);
87 userInfo.FetchInventory(); 87 userInfo.FetchInventory();
88 while (!userInfo.HasReceivedInventory){ };
88 89
89 // Create asset 90 // Create asset
90 SceneObjectGroup object1; 91 SceneObjectGroup object1;
@@ -334,7 +335,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
334 public void TestReplicateArchivePathToUserInventory() 335 public void TestReplicateArchivePathToUserInventory()
335 { 336 {
336 TestHelper.InMethod(); 337 TestHelper.InMethod();
337 CommunicationsManager commsManager = new TestCommunicationsManager(); 338 Scene scene = SceneSetupHelpers.SetupScene(false);
339 CommunicationsManager commsManager = scene.CommsManager;
340
338 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 341 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
339 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>(); 342 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
340 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>(); 343 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();