Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
parent
e444cb9da4
commit
bdcf2d1348
|
@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
|
||||||
using OpenSim.Region.CoreModules.Framework;
|
using OpenSim.Region.CoreModules.Framework;
|
||||||
using OpenSim.Region.CoreModules.Framework.EntityTransfer;
|
using OpenSim.Region.CoreModules.Framework.EntityTransfer;
|
||||||
using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
|
using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
|
||||||
|
using OpenSim.Region.CoreModules.World.Permissions;
|
||||||
using OpenSim.Tests.Common;
|
using OpenSim.Tests.Common;
|
||||||
using OpenSim.Tests.Common.Mock;
|
using OpenSim.Tests.Common.Mock;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
@ -161,6 +162,81 @@ namespace OpenSim.Region.Framework.Scenes.Tests
|
||||||
// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
|
// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Test teleport procedures when the target simulator returns false when queried about access.
|
||||||
|
/// </summary>
|
||||||
|
[Test]
|
||||||
|
public void TestSameSimulatorSeparatedRegionsQueryAccessFails()
|
||||||
|
{
|
||||||
|
TestHelpers.InMethod();
|
||||||
|
TestHelpers.EnableLogging();
|
||||||
|
|
||||||
|
UUID userId = TestHelpers.ParseTail(0x1);
|
||||||
|
Vector3 preTeleportPosition = new Vector3(30, 31, 32);
|
||||||
|
|
||||||
|
EntityTransferModule etm = new EntityTransferModule();
|
||||||
|
LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
|
||||||
|
|
||||||
|
IConfigSource config = new IniConfigSource();
|
||||||
|
config.AddConfig("Modules");
|
||||||
|
config.Configs["Modules"].Set("EntityTransferModule", etm.Name);
|
||||||
|
config.Configs["Modules"].Set("SimulationServices", lscm.Name);
|
||||||
|
|
||||||
|
config.AddConfig("EntityTransfer");
|
||||||
|
|
||||||
|
// In order to run a single threaded regression test we do not want the entity transfer module waiting
|
||||||
|
// for a callback from the destination scene before removing its avatar data.
|
||||||
|
config.Configs["EntityTransfer"].Set("wait_for_callback", false);
|
||||||
|
|
||||||
|
config.AddConfig("Startup");
|
||||||
|
config.Configs["Startup"].Set("serverside_object_permissions", true);
|
||||||
|
|
||||||
|
SceneHelpers sh = new SceneHelpers();
|
||||||
|
TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
|
||||||
|
TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1002, 1000);
|
||||||
|
|
||||||
|
// We need to set up the permisions module on scene B so that our later use of agent limit to deny
|
||||||
|
// QueryAccess won't succeed anyway because administrators are always allowed in and the default
|
||||||
|
// IsAdministrator if no permissions module is present is true.
|
||||||
|
SceneHelpers.SetupSceneModules(sceneB, config, new object[] { new PermissionsModule() });
|
||||||
|
|
||||||
|
// Shared scene modules
|
||||||
|
SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, etm, lscm);
|
||||||
|
|
||||||
|
Vector3 teleportPosition = new Vector3(10, 11, 12);
|
||||||
|
Vector3 teleportLookAt = new Vector3(20, 21, 22);
|
||||||
|
|
||||||
|
ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
|
||||||
|
sp.AbsolutePosition = preTeleportPosition;
|
||||||
|
|
||||||
|
// Make sceneB return false on query access
|
||||||
|
sceneB.RegionInfo.RegionSettings.AgentLimit = 0;
|
||||||
|
|
||||||
|
sceneA.RequestTeleportLocation(
|
||||||
|
sp.ControllingClient,
|
||||||
|
sceneB.RegionInfo.RegionHandle,
|
||||||
|
teleportPosition,
|
||||||
|
teleportLookAt,
|
||||||
|
(uint)TeleportFlags.ViaLocation);
|
||||||
|
|
||||||
|
// ((TestClient)sp.ControllingClient).CompleteTeleportClientSide();
|
||||||
|
|
||||||
|
Assert.That(sceneB.GetScenePresence(userId), Is.Null);
|
||||||
|
|
||||||
|
ScenePresence sceneASp = sceneA.GetScenePresence(userId);
|
||||||
|
Assert.That(sceneASp, Is.Not.Null);
|
||||||
|
Assert.That(sceneASp.Scene.RegionInfo.RegionName, Is.EqualTo(sceneA.RegionInfo.RegionName));
|
||||||
|
Assert.That(sceneASp.AbsolutePosition, Is.EqualTo(preTeleportPosition));
|
||||||
|
|
||||||
|
// TODO: Add assertions to check correct circuit details in both scenes.
|
||||||
|
|
||||||
|
// Lookat is sent to the client only - sp.Lookat does not yield the same thing (calculation from camera
|
||||||
|
// position instead).
|
||||||
|
// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
|
||||||
|
|
||||||
|
TestHelpers.DisableLogging();
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestSameSimulatorNeighbouringRegionsTeleport()
|
public void TestSameSimulatorNeighbouringRegionsTeleport()
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,7 +61,7 @@ namespace OpenSim.Tests.Common
|
||||||
private static Stream DisableLoggingConfigStream
|
private static Stream DisableLoggingConfigStream
|
||||||
= new MemoryStream(
|
= new MemoryStream(
|
||||||
Encoding.UTF8.GetBytes(
|
Encoding.UTF8.GetBytes(
|
||||||
// "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>")));
|
// "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>"));
|
||||||
//"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>")));
|
//"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>")));
|
||||||
// "<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"));
|
// "<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"));
|
||||||
// "<configuration><log4net><root></root></log4net></configuration>")));
|
// "<configuration><log4net><root></root></log4net></configuration>")));
|
||||||
|
|
Loading…
Reference in New Issue