diff options
author | Justin Clarke Casey | 2009-04-14 18:49:45 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-14 18:49:45 +0000 |
commit | d0744f8eca6adc2b6ae257f581792bd8eae16ea2 (patch) | |
tree | c6fe087005bb4d1a0ccf7ded71b611cec721a817 /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |
parent | Fix for minor bug introduced yesterday, HG only. Can't lookup the profile whe... (diff) | |
download | opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.zip opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.gz opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.bz2 opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.xz |
* Make archiver tests pump the asset server manually instead of starting the normal runtime thread
* This may eliminate the occasional archive test freezes, since they appeared to occur when somehow the asset server didn't pick up on the presence of a request in the asset
quque
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 04c3289..165a607 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -34,6 +34,7 @@ using NUnit.Framework; | |||
34 | using NUnit.Framework.SyntaxHelpers; | 34 | using NUnit.Framework.SyntaxHelpers; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | ||
37 | using OpenSim.Framework.Serialization; | 38 | using OpenSim.Framework.Serialization; |
38 | using OpenSim.Region.CoreModules.World.Serialiser; | 39 | using OpenSim.Region.CoreModules.World.Serialiser; |
39 | using OpenSim.Region.CoreModules.World.Terrain; | 40 | using OpenSim.Region.CoreModules.World.Terrain; |
@@ -67,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
67 | SerialiserModule serialiserModule = new SerialiserModule(); | 68 | SerialiserModule serialiserModule = new SerialiserModule(); |
68 | TerrainModule terrainModule = new TerrainModule(); | 69 | TerrainModule terrainModule = new TerrainModule(); |
69 | 70 | ||
70 | Scene scene = SceneSetupHelpers.SetupScene(); | 71 | Scene scene = SceneSetupHelpers.SetupScene(false); |
71 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule); | 72 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule); |
72 | 73 | ||
73 | SceneObjectPart part1; | 74 | SceneObjectPart part1; |
@@ -114,6 +115,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
114 | lock (this) | 115 | lock (this) |
115 | { | 116 | { |
116 | archiverModule.ArchiveRegion(archiveWriteStream); | 117 | archiverModule.ArchiveRegion(archiveWriteStream); |
118 | AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; | ||
119 | while (assetServer.HasWaitingRequests()) | ||
120 | assetServer.ProcessNextRequest(); | ||
121 | |||
117 | Monitor.Wait(this, 60000); | 122 | Monitor.Wait(this, 60000); |
118 | } | 123 | } |
119 | 124 | ||