OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work around some 'tests' error: object crossing is async

LSLKeyTest
UbitUmarov 2015-11-16 20:34:23 +00:00
parent d19e4f598f
commit 250db8c82a
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
View File

@ -37,6 +37,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
using OpenSim.Region.CoreModules.World.Land; using OpenSim.Region.CoreModules.World.Land;
using OpenSim.Region.OptionalModules; using OpenSim.Region.OptionalModules;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
using System.Threading;
namespace OpenSim.Region.Framework.Scenes.Tests namespace OpenSim.Region.Framework.Scenes.Tests
{ {
@ -64,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestCrossOnSameSimulator() public void TestCrossOnSameSimulator()
{ {
TestHelpers.InMethod(); TestHelpers.InMethod();
// TestHelpers.EnableLogging(); // TestHelpers.EnableLogging();
@ -94,6 +96,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Cross with a negative value // Cross with a negative value
so1.AbsolutePosition = new Vector3(128, -10, 20); so1.AbsolutePosition = new Vector3(128, -10, 20);
// crossing is async
Thread.Sleep(500);
Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id)); Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id)); Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
} }
@ -154,6 +159,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
sceneA.SceneGraph.UpdatePrimGroupPosition( sceneA.SceneGraph.UpdatePrimGroupPosition(
so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), userId); so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), userId);
// crossing is async
Thread.Sleep(500);
SceneObjectGroup so1PostCross; SceneObjectGroup so1PostCross;
{ {
@ -181,6 +189,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
sceneB.SceneGraph.UpdatePrimGroupPosition( sceneB.SceneGraph.UpdatePrimGroupPosition(
so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), userId); so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), userId);
// crossing is async
Thread.Sleep(500);
{ {
ScenePresence sp1SceneBPostReCross = sceneB.GetScenePresence(userId); ScenePresence sp1SceneBPostReCross = sceneB.GetScenePresence(userId);
Assert.IsTrue(sp1SceneBPostReCross.IsChildAgent, "sp1SceneBPostReCross.IsChildAgent unexpectedly false"); Assert.IsTrue(sp1SceneBPostReCross.IsChildAgent, "sp1SceneBPostReCross.IsChildAgent unexpectedly false");
@ -252,6 +263,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// because only this will execute permission checks in the source region. // because only this will execute permission checks in the source region.
sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), userId); sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), userId);
// crossing is async
Thread.Sleep(500);
Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id)); Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id)); Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
} }