* Get rid of a unit test race condition based on my misreading of the AutoResetEvent docs

* Hopefully this will reduce the spike in build failures seen in the past few days (since I introduced an addition oar test)
0.6.3-post-fixes
Justin Clarke Casey 2009-02-17 16:25:59 +00:00
parent 8a39223320
commit 014e9e2c6d
1 changed files with 4 additions and 2 deletions

View File

@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[TestFixture] [TestFixture]
public class ArchiverTests public class ArchiverTests
{ {
private EventWaitHandle m_waitHandle = new AutoResetEvent(false); private EventWaitHandle m_waitHandle = new ManualResetEvent(false);
private void SaveCompleted(string errorMessage) private void SaveCompleted(string errorMessage)
{ {
@ -108,6 +108,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
scene.EventManager.OnOarFileSaved += SaveCompleted; scene.EventManager.OnOarFileSaved += SaveCompleted;
archiverModule.ArchiveRegion(archiveWriteStream); archiverModule.ArchiveRegion(archiveWriteStream);
m_waitHandle.WaitOne(60000, true); m_waitHandle.WaitOne(60000, true);
m_waitHandle.Reset();
byte[] archive = archiveWriteStream.ToArray(); byte[] archive = archiveWriteStream.ToArray();
MemoryStream archiveReadStream = new MemoryStream(archive); MemoryStream archiveReadStream = new MemoryStream(archive);
@ -252,6 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
scene.EventManager.OnOarFileSaved += SaveCompleted; scene.EventManager.OnOarFileSaved += SaveCompleted;
archiverModule.ArchiveRegion(archiveWriteStream); archiverModule.ArchiveRegion(archiveWriteStream);
m_waitHandle.WaitOne(60000, true); m_waitHandle.WaitOne(60000, true);
m_waitHandle.Reset();
} }
{ {