From 250db8c82a68680cb6ed8d0cbc39f3041393fce8 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 16 Nov 2015 20:34:23 +0000
Subject:  work around some 'tests' error: object crossing is async

---
 .../Framework/Scenes/Tests/SceneObjectCrossingTests.cs     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Tests')

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
index 5635c20..4a98746 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -37,6 +37,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.OptionalModules;
 using OpenSim.Tests.Common;
+using System.Threading;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -64,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestCrossOnSameSimulator()
         {
+
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
@@ -94,6 +96,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Cross with a negative value
             so1.AbsolutePosition = new Vector3(128, -10, 20);
 
+            // crossing is async
+            Thread.Sleep(500);
+            
             Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
             Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
         }
@@ -154,6 +159,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             sceneA.SceneGraph.UpdatePrimGroupPosition(
                 so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), userId);
 
+            // crossing is async
+            Thread.Sleep(500);
+
             SceneObjectGroup so1PostCross;
 
             {
@@ -181,6 +189,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             sceneB.SceneGraph.UpdatePrimGroupPosition(
                 so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), userId);
 
+            // crossing is async
+            Thread.Sleep(500);
+
             {
                 ScenePresence sp1SceneBPostReCross = sceneB.GetScenePresence(userId);
                 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.
             sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), userId);
 
+            // crossing is async
+            Thread.Sleep(500);
+
             Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
             Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
         }
-- 
cgit v1.1