From 2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:02:19 +0100
Subject: Fix issue where objects removed via llDie() would not disappear for
users looking in from neighbouring sims.
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
---
.../Scenes/Tests/SceneObjectDeRezTests.cs | 78 +++++++++++++++++++++-
1 file changed, 75 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index bde15cd..f738ff1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -33,7 +33,9 @@ using NUnit.Framework;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
using OpenSim.Region.CoreModules.World.Permissions;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
@@ -52,6 +54,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[TestFixture]
public class SceneObjectDeRezTests : OpenSimTestCase
{
+ [TestFixtureSetUp]
+ public void FixtureInit()
+ {
+ // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread.
+ // This facility was added after the original async delete tests were written, so it may be possible now
+ // to not bother explicitly disabling their async (since everything will be running sync).
+ Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+ }
+
+ [TestFixtureTearDown]
+ public void TearDown()
+ {
+ // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+ // threads. Possibly, later tests should be rewritten so none of them require async stuff (which regression
+ // tests really shouldn't).
+ Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+ }
+
///
/// Test deleting an object from a scene.
///
@@ -63,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
@@ -87,7 +107,59 @@ namespace OpenSim.Region.Framework.Scenes.Tests
sogd.InventoryDeQueueAndDelete();
SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
- Assert.That(retrievedPart2, Is.Null);
+ Assert.That(retrievedPart2, Is.Null);
+ }
+
+ ///
+ /// Test that child and root agents correctly receive KillObject notifications.
+ ///
+ [Test]
+ public void TestDeRezSceneObjectToAgents()
+ {
+ TestHelpers.InMethod();
+// TestHelpers.EnableLogging();
+
+ SceneHelpers sh = new SceneHelpers();
+ TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+ TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999);
+
+ // We need this so that the creation of the root client for userB in sceneB can trigger the creation of a child client in sceneA
+ LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+ EntityTransferModule etmB = new EntityTransferModule();
+ IConfigSource config = new IniConfigSource();
+ IConfig modulesConfig = config.AddConfig("Modules");
+ modulesConfig.Set("EntityTransferModule", etmB.Name);
+ modulesConfig.Set("SimulationServices", lscm.Name);
+ SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+ SceneHelpers.SetupSceneModules(sceneB, config, etmB);
+
+ // We need this for derez
+ SceneHelpers.SetupSceneModules(sceneA, new PermissionsModule());
+
+ UserAccount uaA = UserAccountHelpers.CreateUserWithInventory(sceneA, "Andy", "AAA", 0x1, "");
+ UserAccount uaB = UserAccountHelpers.CreateUserWithInventory(sceneA, "Brian", "BBB", 0x2, "");
+
+ TestClient clientA = (TestClient)SceneHelpers.AddScenePresence(sceneA, uaA).ControllingClient;
+
+ // This is the more long-winded route we have to take to get a child client created for userB in sceneA
+ // rather than just calling AddScenePresence() as for userA
+ AgentCircuitData acd = SceneHelpers.GenerateAgentData(uaB);
+ TestClient clientB = new TestClient(acd, sceneB);
+ List childClientsB = new List();
+ EntityTransferHelpers.SetUpInformClientOfNeighbour(clientB, childClientsB);
+
+ SceneHelpers.AddScenePresence(sceneB, clientB, acd);
+
+ SceneObjectGroup so = SceneHelpers.AddSceneObject(sceneA);
+ uint soLocalId = so.LocalId;
+
+ sceneA.DeleteSceneObject(so, false);
+
+ Assert.That(clientA.ReceivedKills.Count, Is.EqualTo(1));
+ Assert.That(clientA.ReceivedKills[0], Is.EqualTo(soLocalId));
+
+ Assert.That(childClientsB[0].ReceivedKills.Count, Is.EqualTo(1));
+ Assert.That(childClientsB[0].ReceivedKills[0], Is.EqualTo(soLocalId));
}
///
@@ -106,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
--
cgit v1.1