aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-08-14 19:06:24 +0100
committerJustin Clark-Casey (justincc)2009-08-14 19:06:24 +0100
commit957962b48276861948267701159775c2361b235b (patch)
treeed72a40d52cb6506f48857370949fa0758948c34 /OpenSim/Region
parentReturn minimum mono version in README to 2.0.1 for now (recommended is still ... (diff)
downloadopensim-SC_OLD-957962b48276861948267701159775c2361b235b.zip
opensim-SC_OLD-957962b48276861948267701159775c2361b235b.tar.gz
opensim-SC_OLD-957962b48276861948267701159775c2361b235b.tar.bz2
opensim-SC_OLD-957962b48276861948267701159775c2361b235b.tar.xz
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs36
1 files changed, 9 insertions, 27 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 28b4d64..2169e36 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -395,17 +395,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
395 userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived); 395 userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived);
396 Monitor.Wait(this, 60000); 396 Monitor.Wait(this, 60000);
397 } 397 }
398
399 //userInfo.FetchInventory();
400 /*
401 for (int i = 0 ; i < 50 ; i++)
402 {
403 if (userInfo.HasReceivedInventory == true)
404 break;
405 Thread.Sleep(200);
406 }
407 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
408 */
409 398
410 Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder); 399 Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
411 400
@@ -429,22 +418,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
429 418
430 Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder); 419 Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
431 420
432 try 421 new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
433 { 422 .ReplicateArchivePathToUserInventory(
434 new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null) 423 itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
435 .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded); 424
436 425 Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
437 Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder); 426 InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
438 InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a"); 427 Assert.That(folder1, Is.Not.Null, "Could not find folder a");
439 Assert.That(folder1, Is.Not.Null, "Could not find folder a"); 428 InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");
440 InventoryFolderImpl folder2 = folder1.FindFolderByPath("b"); 429 Assert.That(folder2, Is.Not.Null, "Could not find folder b");
441 Assert.That(folder2, Is.Not.Null, "Could not find folder b");
442 }
443 catch (NullReferenceException e)
444 {
445 // Non fatal for now until we resolve the race condition
446 Console.WriteLine("Test failed with {0}", e);
447 }
448 } 430 }
449 } 431 }
450} 432}