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

Remove testing cruft that is blocking the new protocols. Unit tests no 

longer test TP v1 now.
TP v1 will be removed within 6 months anyway.
avinationmerge
Melanie Thielker 2015-10-31 17:22:27 +01:00
parent dc6bdbf740
commit e8e0ba6d8f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
View File

@ -802,6 +802,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
} }
/*
[Test] [Test]
public void TestSameSimulatorNeighbouringRegionsTeleportV1() public void TestSameSimulatorNeighbouringRegionsTeleportV1()
{ {
@ -909,6 +910,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
// Check events // Check events
Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
} }
*/
[Test] [Test]
public void TestSameSimulatorNeighbouringRegionsTeleportV2() public void TestSameSimulatorNeighbouringRegionsTeleportV2()

8
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
View File

@ -45,11 +45,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Version of this service.
/// </summary>
public float ServiceVersion { get; set; }
/// <summary> /// <summary>
/// Map region ID to scene. /// Map region ID to scene.
/// </summary> /// </summary>
@ -81,7 +76,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
public void InitialiseService(IConfigSource configSource) public void InitialiseService(IConfigSource configSource)
{ {
ServiceVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
} }
public void PostInitialise() public void PostInitialise()
@ -253,7 +247,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason) public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason)
{ {
reason = "Communications failure"; reason = "Communications failure";
version = ServiceVersion; // If it's within the process, use max. If it's not, the connector will overwrite this version = VersionInfo.SimulationServiceVersionAcceptedMax; // If it's within the process, use max. If it's not, the connector will overwrite this
if (destination == null) if (destination == null)
return false; return false;

6
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
View File

@ -105,6 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt)); // Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
} }
/*
[Test] [Test]
public void TestSameSimulatorIsolatedRegionsV1() public void TestSameSimulatorIsolatedRegionsV1()
{ {
@ -178,6 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// position instead). // position instead).
// Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt)); // Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
} }
*/
[Test] [Test]
public void TestSameSimulatorIsolatedRegionsV2() public void TestSameSimulatorIsolatedRegionsV2()
@ -488,6 +490,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// TestHelpers.DisableLogging(); // TestHelpers.DisableLogging();
} }
/*
[Test] [Test]
public void TestSameSimulatorNeighbouringRegionsV1() public void TestSameSimulatorNeighbouringRegionsV1()
{ {
@ -573,6 +576,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// TestHelpers.DisableLogging(); // TestHelpers.DisableLogging();
} }
*/
[Test] [Test]
public void TestSameSimulatorNeighbouringRegionsV2() public void TestSameSimulatorNeighbouringRegionsV2()
@ -658,4 +662,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// TestHelpers.DisableLogging(); // TestHelpers.DisableLogging();
} }
} }
} }