aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-08-05 18:59:44 +0100
committerJustin Clark-Casey (justincc)2009-08-05 18:59:44 +0100
commitf8d8f07cb44853710706559632e709af5fc8971b (patch)
tree8c53dba7dcc7dc562bae3c5c47669d04de1a0e24
parentRecomment TestReplicateArchivePathToUserInventory() for now due to occasional... (diff)
downloadopensim-SC_OLD-f8d8f07cb44853710706559632e709af5fc8971b.zip
opensim-SC_OLD-f8d8f07cb44853710706559632e709af5fc8971b.tar.gz
opensim-SC_OLD-f8d8f07cb44853710706559632e709af5fc8971b.tar.bz2
opensim-SC_OLD-f8d8f07cb44853710706559632e709af5fc8971b.tar.xz
Remove waiting in TestReplicateArchivePathToUserInventory() since local inventory loading is synchronous
Insert a little more debugging info in case the occasional failure reoccurs
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs7
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs1
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 4928ede..95308ea 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
358 /// <summary> 358 /// <summary>
359 /// Test replication of an archive path to the user's inventory. 359 /// Test replication of an archive path to the user's inventory.
360 /// </summary> 360 /// </summary>
361 //[Test] 361 [Test]
362 public void TestReplicateArchivePathToUserInventory() 362 public void TestReplicateArchivePathToUserInventory()
363 { 363 {
364 TestHelper.InMethod(); 364 TestHelper.InMethod();
@@ -367,6 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
367 367
368 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 368 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
369 userInfo.FetchInventory(); 369 userInfo.FetchInventory();
370 /*
370 for (int i = 0 ; i < 50 ; i++) 371 for (int i = 0 ; i < 50 ; i++)
371 { 372 {
372 if (userInfo.HasReceivedInventory == true) 373 if (userInfo.HasReceivedInventory == true)
@@ -374,6 +375,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
374 Thread.Sleep(200); 375 Thread.Sleep(200);
375 } 376 }
376 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)"); 377 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
378 */
377 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>(); 379 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
378 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>(); 380 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
379 381
@@ -394,7 +396,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
394 396
395 new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null) 397 new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
396 .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded); 398 .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
397 399
400 Console.WriteLine("userInfo.RootFolder: {0}", userInfo.RootFolder);
398 InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a"); 401 InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
399 Assert.That(folder1, Is.Not.Null, "Could not find folder a"); 402 Assert.That(folder1, Is.Not.Null, "Could not find folder a");
400 InventoryFolderImpl folder2 = folder1.FindFolderByPath("b"); 403 InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index a304357..e70d985 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenMetaverse; 40using OpenMetaverse;
41 41
42
43namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
44{ 43{
45 public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService 44 public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService