diff options
| author | Justin Clarke Casey | 2009-01-30 21:39:54 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-01-30 21:39:54 +0000 |
| commit | e233aad098fbcdb943aa4710cf4a2877cc805b33 (patch) | |
| tree | 96d953e912a72b8739384ed08db9cb87e7701453 | |
| parent | * minor: remove some mono compiler warnings (diff) | |
| download | opensim-SC-e233aad098fbcdb943aa4710cf4a2877cc805b33.zip opensim-SC-e233aad098fbcdb943aa4710cf4a2877cc805b33.tar.gz opensim-SC-e233aad098fbcdb943aa4710cf4a2877cc805b33.tar.bz2 opensim-SC-e233aad098fbcdb943aa4710cf4a2877cc805b33.tar.xz | |
* Put a wait timeout on the archive test, just in case the archiver never returns
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs index ccd2411..95064e2 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs | |||
| @@ -75,7 +75,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests | |||
| 75 | EventWaitHandle waitHandle = new ManualResetEvent(false); | 75 | EventWaitHandle waitHandle = new ManualResetEvent(false); |
| 76 | MemoryStream archiveWriteStream = new MemoryStream(); | 76 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 77 | archiverModule.ArchiveRegion(archiveWriteStream, waitHandle); | 77 | archiverModule.ArchiveRegion(archiveWriteStream, waitHandle); |
| 78 | waitHandle.WaitOne(); | 78 | waitHandle.WaitOne(60000, true); |
| 79 | 79 | ||
| 80 | byte[] archive = archiveWriteStream.ToArray(); | 80 | byte[] archive = archiveWriteStream.ToArray(); |
| 81 | MemoryStream archiveReadStream = new MemoryStream(archive); | 81 | MemoryStream archiveReadStream = new MemoryStream(archive); |