diff options
author | Diva Canto | 2013-08-03 21:27:32 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-03 21:27:32 -0700 |
commit | 5b4b349776613d9054e85727f8f6a1f079a5225a (patch) | |
tree | abff3bbbcaa0c4cbb6182852588f7861cb4d9437 /OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | |
parent | More on HG inventory and OutboundPermission: disallowing giving inventory to ... (diff) | |
download | opensim-SC_OLD-5b4b349776613d9054e85727f8f6a1f079a5225a.zip opensim-SC_OLD-5b4b349776613d9054e85727f8f6a1f079a5225a.tar.gz opensim-SC_OLD-5b4b349776613d9054e85727f8f6a1f079a5225a.tar.bz2 opensim-SC_OLD-5b4b349776613d9054e85727f8f6a1f079a5225a.tar.xz |
Fix the failing TestSendImage. J2K decoding is async.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs index 83144e3..6aa8bcc 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Threading; | ||
32 | using log4net.Config; | 33 | using log4net.Config; |
33 | using Nini.Config; | 34 | using Nini.Config; |
34 | using NUnit.Framework; | 35 | using NUnit.Framework; |
@@ -105,7 +106,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
105 | args.requestSequence = 1; | 106 | args.requestSequence = 1; |
106 | 107 | ||
107 | llim.EnqueueReq(args); | 108 | llim.EnqueueReq(args); |
108 | llim.ProcessImageQueue(20); | 109 | |
110 | // We now have to wait and hit the processing wheel, because the decoding is async | ||
111 | int i = 10; | ||
112 | while (i-- > 0) | ||
113 | { | ||
114 | llim.ProcessImageQueue(20); | ||
115 | Thread.Sleep(100); | ||
116 | } | ||
109 | 117 | ||
110 | Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(1)); | 118 | Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(1)); |
111 | } | 119 | } |