1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
index 264bfe1..5d6bc8d 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -62,15 +62,14 @@ namespace OpenSim.Framework.Communications.Tests
            TestAssetDataPlugin assetPlugin = new TestAssetDataPlugin();
            assetPlugin.CreateAsset(asset);
            
-            IAssetServer assetServer = new SQLAssetServer(assetPlugin);
+            SQLAssetServer assetServer = new SQLAssetServer(assetPlugin);
            IAssetCache assetCache = new AssetCache(assetServer);
-            assetServer.Start();
+            
-                        
+            assetCache.GetAsset(assetId, AssetRequestCallback, false);
-            lock (this)
+            
-            {
+            // Manually pump the asset server
-                assetCache.GetAsset(assetId, AssetRequestCallback, false);                     
+            while (assetServer.HasWaitingRequests())
-                Monitor.Wait(this, 60000);
+                assetServer.ProcessNextRequest();
-            }            
            
            Assert.That(
                assetId, Is.EqualTo(m_assetIdReceived), "Asset id stored differs from asset id received");

diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs index 264bfe1..5d6bc8d 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -62,15 +62,14 @@ namespace OpenSim.Framework.Communications.Tests
62	TestAssetDataPlugin assetPlugin = new TestAssetDataPlugin();	62	TestAssetDataPlugin assetPlugin = new TestAssetDataPlugin();
63	assetPlugin.CreateAsset(asset);	63	assetPlugin.CreateAsset(asset);
64		64
65	IAssetServer assetServer = new SQLAssetServer(assetPlugin);	65	SQLAssetServer assetServer = new SQLAssetServer(assetPlugin);
66	IAssetCache assetCache = new AssetCache(assetServer);	66	IAssetCache assetCache = new AssetCache(assetServer);
67	assetServer.Start();	67
68		68	assetCache.GetAsset(assetId, AssetRequestCallback, false);
69	lock (this)	69
70	{	70	// Manually pump the asset server
71	assetCache.GetAsset(assetId, AssetRequestCallback, false);	71	while (assetServer.HasWaitingRequests())
72	Monitor.Wait(this, 60000);	72	assetServer.ProcessNextRequest();
73	}
74		73
75	Assert.That(	74	Assert.That(
76	assetId, Is.EqualTo(m_assetIdReceived), "Asset id stored differs from asset id received");	75	assetId, Is.EqualTo(m_assetIdReceived), "Asset id stored differs from asset id received");