From a6187db2a70e72c6f3bed62241aeec1e31fcb120 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 22 Nov 2015 05:44:06 +0000 Subject: [PATCH] add a a missing monitor.wait if still not needed, mb in future --- .../CoreModules/World/Archiver/Tests/ArchiverTests.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 21299f3def..9de5c43303 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs @@ -759,9 +759,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests byte[] archive = archiveWriteStream.ToArray(); MemoryStream archiveReadStream = new MemoryStream(archive); - Dictionary archiveOptions = new Dictionary(); - archiveOptions.Add("merge", null); - m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); + lock (this) + { + m_scene.EventManager.OnOarFileLoaded += LoadCompleted; + Dictionary archiveOptions = new Dictionary(); + archiveOptions.Add("merge", null); + m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); + Monitor.Wait(this, 60000); + } SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name); Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");