diff options
author | UbitUmarov | 2015-12-16 23:26:51 +0000 |
---|---|---|
committer | UbitUmarov | 2015-12-16 23:26:51 +0000 |
commit | 19c551e815ad783b5da26f316a7a14e67255bacb (patch) | |
tree | b2a247d41be14510c912c3e66ca1a5b3a90f432d /OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs | |
parent | revert last change and add delays on testing, since child updates now have ti... (diff) | |
download | opensim-SC_OLD-19c551e815ad783b5da26f316a7a14e67255bacb.zip opensim-SC_OLD-19c551e815ad783b5da26f316a7a14e67255bacb.tar.gz opensim-SC_OLD-19c551e815ad783b5da26f316a7a14e67255bacb.tar.bz2 opensim-SC_OLD-19c551e815ad783b5da26f316a7a14e67255bacb.tar.xz |
fix test: scene update needs to run after the delay
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs index 0af9504..a720ad9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs | |||
@@ -167,9 +167,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests | |||
167 | 167 | ||
168 | sp1Position = new Vector3(30, 128, 20); | 168 | sp1Position = new Vector3(30, 128, 20); |
169 | sp1.AbsolutePosition = sp1Position; | 169 | sp1.AbsolutePosition = sp1Position; |
170 | sceneWest.Update(1); | ||
170 | sceneEast.Update(1); | 171 | sceneEast.Update(1); |
172 | Thread.Sleep(12000); // child updates are now time limited | ||
173 | sceneWest.Update(5); | ||
174 | sceneEast.Update(5); | ||
171 | 175 | ||
172 | Thread.Sleep(15000); // child updates are now time limited | ||
173 | // Check child position is correct. | 176 | // Check child position is correct. |
174 | Assert.AreEqual( | 177 | Assert.AreEqual( |
175 | new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), | 178 | new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), |
@@ -257,8 +260,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests | |||
257 | sp1.AbsolutePosition = sp1Position; | 260 | sp1.AbsolutePosition = sp1Position; |
258 | sceneNorth.Update(1); | 261 | sceneNorth.Update(1); |
259 | sceneSouth.Update(1); | 262 | sceneSouth.Update(1); |
260 | 263 | Thread.Sleep(12000); // child updates are now time limited | |
261 | Thread.Sleep(15000); // child updates are now time limited | 264 | sceneNorth.Update(5); |
265 | sceneSouth.Update(5); | ||
262 | 266 | ||
263 | // Check child position is correct. | 267 | // Check child position is correct. |
264 | Assert.AreEqual( | 268 | Assert.AreEqual( |