aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorUbitUmarov2015-11-22 04:49:01 +0000
committerUbitUmarov2015-11-22 04:49:01 +0000
commitf6820959b7649ad478e33a24b8cdc29a0dd88889 (patch)
treecce0bd7af5f57fd056df014652e267c6f288a534 /OpenSim/Region/CoreModules/World
parent reduce noise before compare (diff)
downloadopensim-SC-f6820959b7649ad478e33a24b8cdc29a0dd88889.zip
opensim-SC-f6820959b7649ad478e33a24b8cdc29a0dd88889.tar.gz
opensim-SC-f6820959b7649ad478e33a24b8cdc29a0dd88889.tar.bz2
opensim-SC-f6820959b7649ad478e33a24b8cdc29a0dd88889.tar.xz
add Monitor.wait on load
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index d3ba5a5..21299f3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -401,6 +401,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
401 { 401 {
402 m_scene.EventManager.OnOarFileLoaded += LoadCompleted; 402 m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
403 m_archiverModule.DearchiveRegion(archiveReadStream); 403 m_archiverModule.DearchiveRegion(archiveReadStream);
404 Monitor.Wait(this, 60000);
404 } 405 }
405 406
406 Assert.That(m_lastErrorMessage, Is.Null); 407 Assert.That(m_lastErrorMessage, Is.Null);
@@ -450,6 +451,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
450 { 451 {
451 m_scene.EventManager.OnOarFileLoaded += LoadCompleted; 452 m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
452 m_archiverModule.DearchiveRegion(archiveReadStream); 453 m_archiverModule.DearchiveRegion(archiveReadStream);
454 Monitor.Wait(this, 60000);
453 } 455 }
454 456
455 Assert.That(m_lastErrorMessage, Is.Null); 457 Assert.That(m_lastErrorMessage, Is.Null);
@@ -669,6 +671,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
669 { 671 {
670 m_scene.EventManager.OnOarFileLoaded += LoadCompleted; 672 m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
671 m_archiverModule.DearchiveRegion(archiveReadStream); 673 m_archiverModule.DearchiveRegion(archiveReadStream);
674 Monitor.Wait(this, 60000);
672 } 675 }
673 676
674 Assert.That(m_lastErrorMessage, Is.Null); 677 Assert.That(m_lastErrorMessage, Is.Null);
@@ -1015,6 +1018,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
1015 Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); 1018 Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
1016 archiveOptions.Add("merge", null); 1019 archiveOptions.Add("merge", null);
1017 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); 1020 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
1021 Monitor.Wait(this, 60000);
1018 } 1022 }
1019 1023
1020 Assert.That(m_lastErrorMessage, Is.Null); 1024 Assert.That(m_lastErrorMessage, Is.Null);