aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 4fd0718..caa22f7 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
202 //while (assetServer.HasWaitingRequests()) 202 //while (assetServer.HasWaitingRequests())
203 // assetServer.ProcessNextRequest(); 203 // assetServer.ProcessNextRequest();
204 204
205 Monitor.Wait( m_oarEvent, 60000); 205 m_oarEvent.WaitOne(60000);
206 206
207 Assert.That(m_lastRequestId, Is.EqualTo(requestId)); 207 Assert.That(m_lastRequestId, Is.EqualTo(requestId));
208 208
@@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
401 m_oarEvent.Reset(); 401 m_oarEvent.Reset();
402 m_archiverModule.DearchiveRegion(archiveReadStream); 402 m_archiverModule.DearchiveRegion(archiveReadStream);
403 403
404 Monitor.Wait(m_oarEvent, 60000); 404 m_oarEvent.WaitOne(60000);
405 405
406 Assert.That(m_lastErrorMessage, Is.Null); 406 Assert.That(m_lastErrorMessage, Is.Null);
407 407
@@ -450,7 +450,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
450 m_oarEvent.Reset(); 450 m_oarEvent.Reset();
451 m_archiverModule.DearchiveRegion(archiveReadStream); 451 m_archiverModule.DearchiveRegion(archiveReadStream);
452 452
453 Monitor.Wait(m_oarEvent, 60000); 453 m_oarEvent.WaitOne(60000);
454 454
455 Assert.That(m_lastErrorMessage, Is.Null); 455 Assert.That(m_lastErrorMessage, Is.Null);
456 456
@@ -500,7 +500,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
500 m_archiverModule.ArchiveRegion( 500 m_archiverModule.ArchiveRegion(
501 archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } }); 501 archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });
502 502
503 Monitor.Wait(m_oarEvent, 60000); 503 m_oarEvent.WaitOne(60000);
504 504
505 Assert.That(m_lastRequestId, Is.EqualTo(requestId)); 505 Assert.That(m_lastRequestId, Is.EqualTo(requestId));
506 506
@@ -530,7 +530,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
530 m_oarEvent.Reset(); 530 m_oarEvent.Reset();
531 archiverModule.DearchiveRegion(archiveReadStream); 531 archiverModule.DearchiveRegion(archiveReadStream);
532 532
533 Monitor.Wait(m_oarEvent, 60000); 533 m_oarEvent.WaitOne(60000);
534 534
535 Assert.That(m_lastErrorMessage, Is.Null); 535 Assert.That(m_lastErrorMessage, Is.Null);
536 536
@@ -595,7 +595,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
595 m_oarEvent.Reset(); 595 m_oarEvent.Reset();
596 m_archiverModule.DearchiveRegion(oarStream); 596 m_archiverModule.DearchiveRegion(oarStream);
597 597
598 Monitor.Wait(m_oarEvent, 60000); 598 m_oarEvent.WaitOne(60000);
599 599
600 ILandObject rLo = m_scene.LandChannel.GetLandObject(16, 16); 600 ILandObject rLo = m_scene.LandChannel.GetLandObject(16, 16);
601 LandData rLd = rLo.LandData; 601 LandData rLd = rLo.LandData;
@@ -667,7 +667,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
667 m_oarEvent.Reset(); 667 m_oarEvent.Reset();
668 m_archiverModule.DearchiveRegion(archiveReadStream); 668 m_archiverModule.DearchiveRegion(archiveReadStream);
669 669
670 Monitor.Wait(m_oarEvent, 60000); 670 m_oarEvent.WaitOne(60000);
671 671
672 Assert.That(m_lastErrorMessage, Is.Null); 672 Assert.That(m_lastErrorMessage, Is.Null);
673 RegionSettings loadedRs = m_scene.RegionInfo.RegionSettings; 673 RegionSettings loadedRs = m_scene.RegionInfo.RegionSettings;
@@ -742,7 +742,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
742 m_oarEvent.Reset(); 742 m_oarEvent.Reset();
743 m_archiverModule.ArchiveRegion(archiveWriteStream); 743 m_archiverModule.ArchiveRegion(archiveWriteStream);
744 744
745 Monitor.Wait(m_oarEvent, 60000); 745 m_oarEvent.WaitOne(60000);
746 } 746 }
747 747
748 { 748 {
@@ -759,7 +759,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
759 m_oarEvent.Reset(); 759 m_oarEvent.Reset();
760 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); 760 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
761 761
762 Monitor.Wait(m_oarEvent, 60000); 762 m_oarEvent.WaitOne(60000);
763 763
764 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name); 764 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
765 Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge"); 765 Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");
@@ -842,7 +842,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
842 m_oarEvent.Reset(); 842 m_oarEvent.Reset();
843 m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options); 843 m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
844 844
845 Monitor.Wait(m_oarEvent, 60000); 845 m_oarEvent.WaitOne(60000);
846 846
847 847
848 // Check that the OAR contains the expected data 848 // Check that the OAR contains the expected data
@@ -1013,7 +1013,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
1013 m_oarEvent.Reset(); 1013 m_oarEvent.Reset();
1014 m_archiverModule.DearchiveRegion(archiveReadStream); 1014 m_archiverModule.DearchiveRegion(archiveReadStream);
1015 1015
1016 Monitor.Wait(m_oarEvent, 60000); 1016 m_oarEvent.WaitOne(60000);
1017 1017
1018 Assert.That(m_lastErrorMessage, Is.Null); 1018 Assert.That(m_lastErrorMessage, Is.Null);
1019 1019