aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-12-16 23:13:10 +0000
committerUbitUmarov2015-12-16 23:13:10 +0000
commit764f270d34dcce91e5cbce4120aa8822220c96ee (patch)
tree5def060de442f419505aa9504f846f8a4b215922 /OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
parenttemporary remove the delay on first child updates (diff)
downloadopensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.zip
opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.tar.gz
opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.tar.bz2
opensim-SC_OLD-764f270d34dcce91e5cbce4120aa8822220c96ee.tar.xz
revert last change and add delays on testing, since child updates now have time control, since they are heavy http connections
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
index 2409822..0af9504 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
@@ -41,6 +41,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Services.Interfaces; 42using OpenSim.Services.Interfaces;
43using OpenSim.Tests.Common; 43using OpenSim.Tests.Common;
44using System.Threading;
44 45
45namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests 46namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
46{ 47{
@@ -168,6 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
168 sp1.AbsolutePosition = sp1Position; 169 sp1.AbsolutePosition = sp1Position;
169 sceneEast.Update(1); 170 sceneEast.Update(1);
170 171
172 Thread.Sleep(15000); // child updates are now time limited
171 // Check child position is correct. 173 // Check child position is correct.
172 Assert.AreEqual( 174 Assert.AreEqual(
173 new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 175 new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
@@ -254,6 +256,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
254 sp1Position = new Vector3(30, 128, 20); 256 sp1Position = new Vector3(30, 128, 20);
255 sp1.AbsolutePosition = sp1Position; 257 sp1.AbsolutePosition = sp1Position;
256 sceneNorth.Update(1); 258 sceneNorth.Update(1);
259 sceneSouth.Update(1);
260
261 Thread.Sleep(15000); // child updates are now time limited
257 262
258 // Check child position is correct. 263 // Check child position is correct.
259 Assert.AreEqual( 264 Assert.AreEqual(